aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorFlorian Vaussard <florian.vaussard@epfl.ch>2013-05-31 08:32:56 -0400
committerBenoit Cousson <benoit.cousson@linaro.org>2013-06-18 19:53:38 -0400
commit6d624eabcd4bd11f1304b12f7409a48d3a7743e6 (patch)
tree32326eb6853cd796bbf87c247d14bde23fa71b43 /arch/arm/boot
parent98ef795714a31b3470e9fdd6e977f6733b83f101 (diff)
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/omap2.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-beagle-xm.dts4
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts6
-rw-r--r--arch/arm/boot/dts/omap3-devkit8000.dts6
-rw-r--r--arch/arm/boot/dts/omap3-evm.dts2
-rw-r--r--arch/arm/boot/dts/omap3-igep0020.dts8
-rw-r--r--arch/arm/boot/dts/omap3-igep0030.dts8
-rw-r--r--arch/arm/boot/dts/omap3-tobi.dts2
-rw-r--r--arch/arm/boot/dts/omap3.dtsi2
-rw-r--r--arch/arm/boot/dts/omap4-panda-common.dtsi4
-rw-r--r--arch/arm/boot/dts/omap4-sdp.dts16
-rw-r--r--arch/arm/boot/dts/omap4.dtsi2
-rw-r--r--arch/arm/boot/dts/omap5.dtsi2
13 files changed, 36 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index e6e4587b2a4d..f39b237b9011 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -8,6 +8,8 @@
8 * kind, whether express or implied. 8 * kind, whether express or implied.
9 */ 9 */
10 10
11#include <dt-bindings/gpio/gpio.h>
12
11#include "skeleton.dtsi" 13#include "skeleton.dtsi"
12 14
13/ { 15/ {
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index e0ce823d20b0..1e580d9c88ed 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -29,13 +29,13 @@
29 29
30 heartbeat { 30 heartbeat {
31 label = "beagleboard::usr0"; 31 label = "beagleboard::usr0";
32 gpios = <&gpio5 22 0>; /* 150 -> D6 LED */ 32 gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
33 linux,default-trigger = "heartbeat"; 33 linux,default-trigger = "heartbeat";
34 }; 34 };
35 35
36 mmc { 36 mmc {
37 label = "beagleboard::usr1"; 37 label = "beagleboard::usr1";
38 gpios = <&gpio5 21 0>; /* 149 -> D7 LED */ 38 gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
39 linux,default-trigger = "mmc0"; 39 linux,default-trigger = "mmc0";
40 }; 40 };
41 }; 41 };
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index fcac96aac3e6..434288f30078 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -28,18 +28,18 @@
28 compatible = "gpio-leds"; 28 compatible = "gpio-leds";
29 pmu_stat { 29 pmu_stat {
30 label = "beagleboard::pmu_stat"; 30 label = "beagleboard::pmu_stat";
31 gpios = <&twl_gpio 19 0>; /* LEDB */ 31 gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
32 }; 32 };
33 33
34 heartbeat { 34 heartbeat {
35 label = "beagleboard::usr0"; 35 label = "beagleboard::usr0";
36 gpios = <&gpio5 22 0>; /* 150 -> D6 LED */ 36 gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */
37 linux,default-trigger = "heartbeat"; 37 linux,default-trigger = "heartbeat";
38 }; 38 };
39 39
40 mmc { 40 mmc {
41 label = "beagleboard::usr1"; 41 label = "beagleboard::usr1";
42 gpios = <&gpio5 21 0>; /* 149 -> D7 LED */ 42 gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */
43 linux,default-trigger = "mmc0"; 43 linux,default-trigger = "mmc0";
44 }; 44 };
45 }; 45 };
diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index 8d0f5e40eafe..5be71b1b2bdc 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -22,21 +22,21 @@
22 22
23 heartbeat { 23 heartbeat {
24 label = "devkit8000::led1"; 24 label = "devkit8000::led1";
25 gpios = <&gpio6 26 0>; /* 186 -> LED1 */ 25 gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>; /* 186 -> LED1 */
26 default-state = "on"; 26 default-state = "on";
27 linux,default-trigger = "heartbeat"; 27 linux,default-trigger = "heartbeat";
28 }; 28 };
29 29
30 mmc { 30 mmc {
31 label = "devkit8000::led2"; 31 label = "devkit8000::led2";
32 gpios = <&gpio6 3 0>; /* 163 -> LED2 */ 32 gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 -> LED2 */
33 default-state = "on"; 33 default-state = "on";
34 linux,default-trigger = "none"; 34 linux,default-trigger = "none";
35 }; 35 };
36 36
37 usr { 37 usr {
38 label = "devkit8000::led3"; 38 label = "devkit8000::led3";
39 gpios = <&gpio6 4 0>; /* 164 -> LED3 */ 39 gpios = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* 164 -> LED3 */
40 default-state = "on"; 40 default-state = "on";
41 linux,default-trigger = "usr"; 41 linux,default-trigger = "usr";
42 }; 42 };
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index d75759b59841..baa24bbbcf57 100644
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -28,7 +28,7 @@
28 compatible = "gpio-leds"; 28 compatible = "gpio-leds";
29 ledb { 29 ledb {
30 label = "omap3evm::ledb"; 30 label = "omap3evm::ledb";
31 gpios = <&twl_gpio 19 0>; /* LEDB */ 31 gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */
32 linux,default-trigger = "default-on"; 32 linux,default-trigger = "default-on";
33 }; 33 };
34 }; 34 };
diff --git a/arch/arm/boot/dts/omap3-igep0020.dts b/arch/arm/boot/dts/omap3-igep0020.dts
index c50ce5927af7..e8c48284587c 100644
--- a/arch/arm/boot/dts/omap3-igep0020.dts
+++ b/arch/arm/boot/dts/omap3-igep0020.dts
@@ -19,25 +19,25 @@
19 compatible = "gpio-leds"; 19 compatible = "gpio-leds";
20 boot { 20 boot {
21 label = "omap3:green:boot"; 21 label = "omap3:green:boot";
22 gpios = <&gpio1 26 0>; 22 gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
23 default-state = "on"; 23 default-state = "on";
24 }; 24 };
25 25
26 user0 { 26 user0 {
27 label = "omap3:red:user0"; 27 label = "omap3:red:user0";
28 gpios = <&gpio1 27 0>; 28 gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>;
29 default-state = "off"; 29 default-state = "off";
30 }; 30 };
31 31
32 user1 { 32 user1 {
33 label = "omap3:red:user1"; 33 label = "omap3:red:user1";
34 gpios = <&gpio1 28 0>; 34 gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
35 default-state = "off"; 35 default-state = "off";
36 }; 36 };
37 37
38 user2 { 38 user2 {
39 label = "omap3:green:user1"; 39 label = "omap3:green:user1";
40 gpios = <&twl_gpio 19 1>; 40 gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>;
41 }; 41 };
42 }; 42 };
43 43
diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts
index 5061a27563b6..644d05383836 100644
--- a/arch/arm/boot/dts/omap3-igep0030.dts
+++ b/arch/arm/boot/dts/omap3-igep0030.dts
@@ -19,25 +19,25 @@
19 compatible = "gpio-leds"; 19 compatible = "gpio-leds";
20 boot { 20 boot {
21 label = "omap3:green:boot"; 21 label = "omap3:green:boot";
22 gpios = <&twl_gpio 13 1>; 22 gpios = <&twl_gpio 13 GPIO_ACTIVE_LOW>;
23 default-state = "on"; 23 default-state = "on";
24 }; 24 };
25 25
26 user0 { 26 user0 {
27 label = "omap3:red:user0"; 27 label = "omap3:red:user0";
28 gpios = <&twl_gpio 18 1>; /* LEDA */ 28 gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */
29 default-state = "off"; 29 default-state = "off";
30 }; 30 };
31 31
32 user1 { 32 user1 {
33 label = "omap3:green:user1"; 33 label = "omap3:green:user1";
34 gpios = <&twl_gpio 19 1>; /* LEDB */ 34 gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>; /* LEDB */
35 default-state = "off"; 35 default-state = "off";
36 }; 36 };
37 37
38 user2 { 38 user2 {
39 label = "omap3:red:user1"; 39 label = "omap3:red:user1";
40 gpios = <&gpio1 16 1>; 40 gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
41 default-state = "off"; 41 default-state = "off";
42 }; 42 };
43 }; 43 };
diff --git a/arch/arm/boot/dts/omap3-tobi.dts b/arch/arm/boot/dts/omap3-tobi.dts
index 5df894f8bdef..c7eebbf932f5 100644
--- a/arch/arm/boot/dts/omap3-tobi.dts
+++ b/arch/arm/boot/dts/omap3-tobi.dts
@@ -20,7 +20,7 @@
20 compatible = "gpio-leds"; 20 compatible = "gpio-leds";
21 heartbeat { 21 heartbeat {
22 label = "overo:red:gpio21"; 22 label = "overo:red:gpio21";
23 gpios = <&gpio1 21 0>; 23 gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
24 linux,default-trigger = "heartbeat"; 24 linux,default-trigger = "heartbeat";
25 }; 25 };
26 }; 26 };
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index a0a7b447e48f..fac923b0afd4 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -8,6 +8,8 @@
8 * kind, whether express or implied. 8 * kind, whether express or implied.
9 */ 9 */
10 10
11#include <dt-bindings/gpio/gpio.h>
12
11#include "skeleton.dtsi" 13#include "skeleton.dtsi"
12 14
13/ { 15/ {
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 171a18533703..f5bec4d0a6fa 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -20,13 +20,13 @@
20 compatible = "gpio-leds"; 20 compatible = "gpio-leds";
21 heartbeat { 21 heartbeat {
22 label = "pandaboard::status1"; 22 label = "pandaboard::status1";
23 gpios = <&gpio1 7 0>; 23 gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
24 linux,default-trigger = "heartbeat"; 24 linux,default-trigger = "heartbeat";
25 }; 25 };
26 26
27 mmc { 27 mmc {
28 label = "pandaboard::status2"; 28 label = "pandaboard::status2";
29 gpios = <&gpio1 8 0>; 29 gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
30 linux,default-trigger = "mmc0"; 30 linux,default-trigger = "mmc0";
31 }; 31 };
32 }; 32 };
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index fc7c7f490e94..7a2619470e8b 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -41,42 +41,42 @@
41 compatible = "gpio-leds"; 41 compatible = "gpio-leds";
42 debug0 { 42 debug0 {
43 label = "omap4:green:debug0"; 43 label = "omap4:green:debug0";
44 gpios = <&gpio2 29 0>; /* 61 */ 44 gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>; /* 61 */
45 }; 45 };
46 46
47 debug1 { 47 debug1 {
48 label = "omap4:green:debug1"; 48 label = "omap4:green:debug1";
49 gpios = <&gpio1 30 0>; /* 30 */ 49 gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; /* 30 */
50 }; 50 };
51 51
52 debug2 { 52 debug2 {
53 label = "omap4:green:debug2"; 53 label = "omap4:green:debug2";
54 gpios = <&gpio1 7 0>; /* 7 */ 54 gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; /* 7 */
55 }; 55 };
56 56
57 debug3 { 57 debug3 {
58 label = "omap4:green:debug3"; 58 label = "omap4:green:debug3";
59 gpios = <&gpio1 8 0>; /* 8 */ 59 gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; /* 8 */
60 }; 60 };
61 61
62 debug4 { 62 debug4 {
63 label = "omap4:green:debug4"; 63 label = "omap4:green:debug4";
64 gpios = <&gpio2 18 0>; /* 50 */ 64 gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; /* 50 */
65 }; 65 };
66 66
67 user1 { 67 user1 {
68 label = "omap4:blue:user"; 68 label = "omap4:blue:user";
69 gpios = <&gpio6 9 0>; /* 169 */ 69 gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* 169 */
70 }; 70 };
71 71
72 user2 { 72 user2 {
73 label = "omap4:red:user"; 73 label = "omap4:red:user";
74 gpios = <&gpio6 10 0>; /* 170 */ 74 gpios = <&gpio6 10 GPIO_ACTIVE_HIGH>; /* 170 */
75 }; 75 };
76 76
77 user3 { 77 user3 {
78 label = "omap4:green:user"; 78 label = "omap4:green:user";
79 gpios = <&gpio5 11 0>; /* 139 */ 79 gpios = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* 139 */
80 }; 80 };
81 }; 81 };
82 82
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 7fe2c1883899..4160d7d8db48 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -6,6 +6,8 @@
6 * published by the Free Software Foundation. 6 * published by the Free Software Foundation.
7 */ 7 */
8 8
9#include <dt-bindings/gpio/gpio.h>
10
9#include "skeleton.dtsi" 11#include "skeleton.dtsi"
10 12
11/ { 13/ {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 2a48a029a23f..fa3d5a043d93 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -7,6 +7,8 @@
7 * Based on "omap4.dtsi" 7 * Based on "omap4.dtsi"
8 */ 8 */
9 9
10#include <dt-bindings/gpio/gpio.h>
11
10#include "skeleton.dtsi" 12#include "skeleton.dtsi"
11 13
12/ { 14/ {
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-20 09:45:59 -0500