ARM: nomadik: move hog code to use DT hogs

Instead of introducing a board-specific DT node for biasing the
MMC/SD and SATA ports, use the new device tree hogs.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 3d25dba..0e167ed 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -131,6 +131,16 @@
                                #gpio-cells = <2>;
                                interrupt-controller;
                                #interrupt-cells = <2>;
+                               /*
+                                * This will turn off SATA so that MMC/SD
+                                * can thrive
+                                */
+                               mmcsd-gpio {
+                                       gpio-hog;
+                                       gpios = <2 0x0>;
+                                       output-low;
+                                       line-name = "SATA EN";
+                               };
                        };
                };
        };
@@ -141,12 +151,4 @@
                        wp-gpios = <&stmpe_gpio44 18 GPIO_ACTIVE_HIGH>;
                };
        };
-
-       /* Custom board node with GPIO pins to active etc */
-       usb-s8815 {
-               /* This will turn off SATA so that MMC/SD can thrive */
-               mmcsd-gpio {
-                       gpios = <&stmpe_gpio44 2 0x1>;
-               };
-       };
 };

diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 3c140d0..edcfe24 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -19,6 +19,16 @@
                serial1 = &uart1;
        };
 
+       gpio3: gpio@101e7000 {
+               /* This hog will bias the MMC/SD card detect line */
+               mmcsd-gpio {
+                       gpio-hog;
+                       gpios = <16 0x0>;
+                       output-low;
+                       line-name = "card detect bias";
+               };
+       };
+
        src@101e0000 {
                /* These chrystal drivers are not used on this board */
                disable-sxtalo;
@@ -109,14 +119,6 @@
                };
        };
 
-       /* Custom board node with GPIO pins to active etc */
-       usb-s8815 {
-               /* This will bias the MMC/SD card detect line */
-               mmcsd-gpio {
-                       gpios = <&gpio3 16 0x1>;
-               };
-       };
-
        /* The user LED on the board is set up to be used for heartbeat */
        leds {
                compatible = "gpio-leds";

diff --cc arch/arm/mach-nomadik/cpu-8815.c
Simple merge