ARM: dts: OMAP2+: Use existing constants for GPIOs

Use standard GPIO constants to enhance the readability of DT GPIOs.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>

diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index e6e4587b2a4d2683f913013b07d312aa4864142e..f39b237b9011871976c14b20b05dec157ced8162 100644 (file)
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -8,6 +8,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index e0ce823d20b0a14d4ce8cbc9ba6f5e14997aafd1..1e580d9c88eda7c8f56261965cefb5592278a361 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -29,13 +29,13 @@
 
                heartbeat {
                        label = "beagleboard::usr0";
-                       gpios = <&gpio5 22 0>; /* 150 -> D6 LED */
+                       gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
                        linux,default-trigger = "heartbeat";
                };
 
                mmc {
                        label = "beagleboard::usr1";
-                       gpios = <&gpio5 21 0>; /* 149 -> D7 LED */
+                       gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
                        linux,default-trigger = "mmc0";
                };
        };

diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index fcac96aac3e6eb6a5bc346c60d33576be40b9d1f..434288f300782660faa14a98fcfbeb472b79aa49 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -28,18 +28,18 @@
                compatible = "gpio-leds";
                pmu_stat {
                        label = "beagleboard::pmu_stat";
-                       gpios = <&twl_gpio 19 0>; /* LEDB */
+                       gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
                };
 
                heartbeat {
                        label = "beagleboard::usr0";
-                       gpios = <&gpio5 22 0>; /* 150 -> D6 LED */
+                       gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
                        linux,default-trigger = "heartbeat";
                };
 
                mmc {
                        label = "beagleboard::usr1";
-                       gpios = <&gpio5 21 0>; /* 149 -> D7 LED */
+                       gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
                        linux,default-trigger = "mmc0";
                };
        };

diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 8d0f5e40eafe080d7c69b3c29cfe1e315e83c6c3..5be71b1b2bdc0caa06fa8571e68725a6a37ce760 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -22,21 +22,21 @@
 
                heartbeat {
                        label = "devkit8000::led1";
-                       gpios = <&gpio6 26 0>;  /* 186 -> LED1 */
+                       gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;   /* 186 -> LED1 */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
                mmc {
                        label = "devkit8000::led2";
-                       gpios = <&gpio6 3 0>;   /* 163 -> LED2 */
+                       gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>;    /* 163 -> LED2 */
                        default-state = "on";
                        linux,default-trigger = "none";
                };
 
                usr {
                        label = "devkit8000::led3";
-                       gpios = <&gpio6 4 0>;   /* 164 -> LED3 */
+                       gpios = <&gpio6 4 GPIO_ACTIVE_HIGH>;    /* 164 -> LED3 */
                        default-state = "on";
                        linux,default-trigger = "usr";
                 };

diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index d75759b59841b67bc2420612299bfc1b20dba243..baa24bbbcf5733701c829d7a83ddb41a02d531b7 100644 (file)
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -28,7 +28,7 @@
                compatible = "gpio-leds";
                ledb {
                        label = "omap3evm::ledb";
-                       gpios = <&twl_gpio 19 0>; /* LEDB */
+                       gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
                        linux,default-trigger = "default-on";
                };
        };

diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
index c50ce5927af73f34ba2670299834a5a04295a71b..e8c48284587cb0b741347b501f036f746eb22423 100644 (file)
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -19,25 +19,25 @@
                compatible = "gpio-leds";
                boot {
                         label = "omap3:green:boot";
-                        gpios = <&gpio1 26 0>;
+                        gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
                         default-state = "on";
                };
 
                user0 {
                         label = "omap3:red:user0";
-                        gpios = <&gpio1 27 0>;
+                        gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;
                         default-state = "off";
                };
 
                user1 {
                         label = "omap3:red:user1";
-                        gpios = <&gpio1 28 0>;
+                        gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
                         default-state = "off";
                };
 
                user2 {
                        label = "omap3:green:user1";
-                       gpios = <&twl_gpio 19 1>;
+                       gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>;
                };
        };
 

diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
index 5061a27563b6eca88f915665cd6b838268bdb315..644d05383836f45dfe5612ad760d100fb12e9072 100644 (file)
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -19,25 +19,25 @@
                compatible = "gpio-leds";
                boot {
                         label = "omap3:green:boot";
-                        gpios = <&twl_gpio 13 1>;
+                        gpios = <&twl_gpio 13 GPIO_ACTIVE_LOW>;
                         default-state = "on";
                };
 
                user0 {
                         label = "omap3:red:user0";
-                        gpios = <&twl_gpio 18 1>; /* LEDA */
+                        gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */
                         default-state = "off";
                };
 
                user1 {
                         label = "omap3:green:user1";
-                        gpios = <&twl_gpio 19 1>; /* LEDB */
+                        gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>; /* LEDB */
                         default-state = "off";
                };
 
                user2 {
                         label = "omap3:red:user1";
-                        gpios = <&gpio1 16 1>;
+                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
                         default-state = "off";
                };
        };

diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 5df894f8bdef2a1f12958fe3c4d2a7a15e08a048..c7eebbf932f51a47936312529bc49bd9283fe181 100644 (file)
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -20,7 +20,7 @@
                compatible = "gpio-leds";
                heartbeat {
                        label = "overo:red:gpio21";
-                       gpios = <&gpio1 21 0>;
+                       gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index a0a7b447e48f63ab82bae8ba313eb0f3fe77e9b1..fac923b0afd438603fdaedfae82cb7758e680bb1 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -8,6 +8,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 171a18533703cad37f66578732d0db4f9cfac6f4..f5bec4d0a6faf52e870c6fa22d9a774bdff827fb 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -20,13 +20,13 @@
                compatible = "gpio-leds";
                heartbeat {
                        label = "pandaboard::status1";
-                       gpios = <&gpio1 7 0>;
+                       gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
 
                mmc {
                        label = "pandaboard::status2";
-                       gpios = <&gpio1 8 0>;
+                       gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                };
        };

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index fc7c7f490e942fb1b7cf62e9f6f8956293e5bee1..7a2619470e8be92c32ac38003c3e450c46de5ec1 100644 (file)
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -41,42 +41,42 @@
                compatible = "gpio-leds";
                debug0 {
                        label = "omap4:green:debug0";
-                       gpios = <&gpio2 29 0>; /* 61 */
+                       gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; /* 61 */
                };
 
                debug1 {
                        label = "omap4:green:debug1";
-                       gpios = <&gpio1 30 0>; /* 30 */
+                       gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; /* 30 */
                };
 
                debug2 {
                        label = "omap4:green:debug2";
-                       gpios = <&gpio1 7 0>; /* 7 */
+                       gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; /* 7 */
                };
 
                debug3 {
                        label = "omap4:green:debug3";
-                       gpios = <&gpio1 8 0>; /* 8 */
+                       gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* 8 */
                };
 
                debug4 {
                        label = "omap4:green:debug4";
-                       gpios = <&gpio2 18 0>; /* 50 */
+                       gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; /* 50 */
                };
 
                user1 {
                        label = "omap4:blue:user";
-                       gpios = <&gpio6 9 0>; /* 169 */
+                       gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* 169 */
                };
 
                user2 {
                        label = "omap4:red:user";
-                       gpios = <&gpio6 10 0>; /* 170 */
+                       gpios = <&gpio6 10 GPIO_ACTIVE_HIGH>; /* 170 */
                };
 
                user3 {
                        label = "omap4:green:user";
-                       gpios = <&gpio5 11 0>; /* 139 */
+                       gpios = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* 139 */
                };
        };
 

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 7fe2c18838992c3a0b68e6e92a145fa40d0a9e0c..4160d7d8db48c9f24f86e7bef9321a4fd3c29b19 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -6,6 +6,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 #include "skeleton.dtsi"
 
 / {

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 2a48a029a23f5fe57dfbcda76fe2e7e207b2f524..fa3d5a043d931a4785da0f5df4455fecf7890ab5 100644 (file)
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -7,6 +7,8 @@
  * Based on "omap4.dtsi"
  */
 
+#include <dt-bindings/gpio/gpio.h>
+
 #include "skeleton.dtsi"
 
 / {