Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / imx6q-sabresd.dts

diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
index 0038228c508cb2dd64a96ce30ee9e8512b1182ed..9cbdfe7a0931ff4fa8c09db3c9ea0fa3bb397609 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabresd.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -20,21 +20,6 @@
        compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
 };
 
-&iomuxc {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
-
-       hog {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX6Q_PAD_GPIO_4__GPIO1_IO04   0x80000000
-                               MX6Q_PAD_GPIO_5__GPIO1_IO05   0x80000000
-                               MX6Q_PAD_NANDF_D0__GPIO2_IO00 0x80000000
-                               MX6Q_PAD_NANDF_D1__GPIO2_IO01 0x80000000
-                               MX6Q_PAD_NANDF_D2__GPIO2_IO02 0x80000000
-                               MX6Q_PAD_NANDF_D3__GPIO2_IO03 0x80000000
-                               MX6Q_PAD_GPIO_0__CCM_CLKO1    0x130b0
-                       >;
-               };
-       };
+&sata {
+       status = "okay";
 };