ARM: dts: ux500: use the GPIO DT header

Use the <dt-bindings/gpio/gpio.h> header instead of using
hardcoded values for the GPIO flags. Eradicate the totally
bogus "0x4" flag used and set that to GPIO_ACTIVE_HIGH as is
proper, switch the inverted card detect on the Snowball to
flag using GPIO_ACTIVE_LOW instead of using the MMC-specific
inversion flag.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
index c8b815819cfe3cb6b3268cf700aedfbbfbd4a908..b3b9bb8e1aa847a532cec7008b54a7735074920e 100644 (file)
--- a/arch/arm/boot/dts/ste-ccu9540.dts
+++ b/arch/arm/boot/dts/ste-ccu9540.dts
@@ -49,7 +49,7 @@
                        cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
 
-                       cd-gpios  = <&gpio7 6 0x4>; // 230
+                       cd-gpios  = <&gpio7 6 GPIO_ACTIVE_HIGH>; // 230
                        cd-inverted;
 
                        status = "okay";

diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index 341f5b7ed242a6205a2cf426505f4601f825d435..d85830d80252d881cc182c509ec6f7744f8dafc3 100644 (file)
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -12,6 +12,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/mfd/dbx500-prcmu.h>
 #include <dt-bindings/arm/ux500_pm_domains.h>
+#include <dt-bindings/gpio/gpio.h>
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
index c3987ad06d796e9133498253df31a608befd11b9..6f720756057d62eec2e24dc7fc453aafa9edfc59 100644 (file)
--- a/arch/arm/boot/dts/ste-href-stuib.dtsi
+++ b/arch/arm/boot/dts/ste-href-stuib.dtsi
@@ -22,13 +22,13 @@
 
                button@139 {
                        /* Proximity sensor */
-                       gpios = <&gpio6 25 0x4>;
+                       gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
                        linux,code = <11>; /* SW_FRONT_PROXIMITY */
                        label = "SFH7741 Proximity Sensor";
                };
                button@145 {
                        /* Hall sensor */
-                       gpios = <&gpio4 17 0x4>;
+                       gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
                        linux,code = <0>; /* SW_LID */
                        label = "HED54XXU11 Hall Effect Sensor";
                };

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 55f9d0cc90f3ab2d11b0461f6aae06a4d6b442b5..54d80da2a5dfe947187909f2a47993115c28de17 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -24,13 +24,13 @@
 
                button@139 {
                        /* Proximity sensor */
-                       gpios = <&gpio6 25 0x4>;
+                       gpios = <&gpio6 25 GPIO_ACTIVE_HIGH>;
                        linux,code = <11>; /* SW_FRONT_PROXIMITY */
                        label = "SFH7741 Proximity Sensor";
                };
                button@145 {
                        /* Hall sensor */
-                       gpios = <&gpio4 17 0x4>;
+                       gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>;
                        linux,code = <0>; /* SW_LID */
                        label = "HED54XXU11 Hall Effect Sensor";
                };

diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index b0278f4c486cefa6f3363f91fd3f312bfc87015f..ece222d51717c294385fd2edc8960b1ebd6f471b 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -18,7 +18,7 @@
 / {
        gpio_keys {
                button@1 {
-                       gpios = <&tc3589x_gpio 7 0x4>;
+                       gpios = <&tc3589x_gpio 7 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -68,12 +68,12 @@
 
                // External Micro SD slot
                sdi0_per1@80126000 {
-                       cd-gpios  = <&tc3589x_gpio 3 0x4>;
+                       cd-gpios  = <&tc3589x_gpio 3 GPIO_ACTIVE_HIGH>;
                };
 
                vmmci: regulator-gpio {
-                       gpios = <&tc3589x_gpio 18 0x4>;
-                       enable-gpio = <&tc3589x_gpio 17 0x4>;
+                       gpios = <&tc3589x_gpio 18 GPIO_ACTIVE_HIGH>;
+                       enable-gpio = <&tc3589x_gpio 17 GPIO_ACTIVE_HIGH>;
                };
 
                pinctrl {

diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 149a72e7e37aa39a99798d04d741041732c97294..45d7af3267185cd6c34b250086ecccbecd2dc1f8 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -20,12 +20,12 @@
        soc {
                // External Micro SD slot
                sdi0_per1@80126000 {
-                       cd-gpios  = <&gpio2 31 0x4>; // 95
+                       cd-gpios  = <&gpio2 31 GPIO_ACTIVE_HIGH>; // 95
                };
 
                vmmci: regulator-gpio {
-                       gpios = <&gpio0 5 0x4>;
-                       enable-gpio = <&gpio5 9 0x4>;
+                       gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
+                       enable-gpio = <&gpio5 9 GPIO_ACTIVE_HIGH>;
                };
 
                pinctrl {

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 08f82077b64d47b4012c2b1d64ccc2aa7fb52282..36e84efc401c0246bca5e82bda1cc3c7bf938c70 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -50,35 +50,35 @@
                        wakeup-source;
                        linux,code = <2>;
                        label = "userpb";
-                       gpios = <&gpio1 0 0x4>;
+                       gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
                };
                button@2 {
                        debounce_interval = <50>;
                        wakeup-source;
                        linux,code = <3>;
                        label = "extkb1";
-                       gpios = <&gpio4 23 0x4>;
+                       gpios = <&gpio4 23 GPIO_ACTIVE_HIGH>;
                };
                button@3 {
                        debounce_interval = <50>;
                        wakeup-source;
                        linux,code = <4>;
                        label = "extkb2";
-                       gpios = <&gpio4 24 0x4>;
+                       gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>;
                };
                button@4 {
                        debounce_interval = <50>;
                        wakeup-source;
                        linux,code = <5>;
                        label = "extkb3";
-                       gpios = <&gpio5 1 0x4>;
+                       gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
                };
                button@5 {
                        debounce_interval = <50>;
                        wakeup-source;
                        linux,code = <6>;
                        label = "extkb4";
-                       gpios = <&gpio5 2 0x4>;
+                       gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -88,7 +88,7 @@
                pinctrl-0 = <&gpioled_snowball_mode>;
                used-led {
                        label = "user_led";
-                       gpios = <&gpio4 14 0x4>;
+                       gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
@@ -155,8 +155,8 @@
                vmmci: regulator-gpio {
                        compatible = "regulator-gpio";
 
-                       gpios = <&gpio7 4 0x4>;
-                       enable-gpio = <&gpio6 25 0x4>;
+                       gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+                       enable-gpio = <&gpio6 25 GPIO_ACTIVE_HIGH>;
 
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <2900000>;
@@ -182,8 +182,7 @@
                        pinctrl-0 = <&sdi0_default_mode>;
                        pinctrl-1 = <&sdi0_sleep_mode>;
 
-                       cd-gpios  = <&gpio6 26 0x4>; // 218
-                       cd-inverted;
+                       cd-gpios  = <&gpio6 26 GPIO_ACTIVE_LOW>; // 218
 
                        status = "okay";
                };