diff options
author | Tim Harvey <tharvey@gateworks.com> | 2014-09-09 02:07:28 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-15 22:27:20 -0400 |
commit | 326cdb16552c3670fefd583d94fe797e776130b6 (patch) | |
tree | 47bee22922f70c8a4a6ca7a1fd3820a5103bc867 | |
parent | e32ba7a7dad114d87c4d7411d07af7a26e4119ce (diff) |
ARM: dts: imx: ventana: use gpio constants
Use the gpio contants defined in bindings for active high/low
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r-- | arch/arm/boot/dts/imx6q-gw5400-a.dts | 23 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 22 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 22 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 22 |
5 files changed, 56 insertions, 47 deletions
diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts index 035f2b17f386..9687cd82c2b6 100644 --- a/arch/arm/boot/dts/imx6q-gw5400-a.dts +++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include <dt-bindings/gpio/gpio.h> | ||
13 | #include "imx6q.dtsi" | 14 | #include "imx6q.dtsi" |
14 | 15 | ||
15 | / { | 16 | / { |
@@ -40,20 +41,20 @@ | |||
40 | 41 | ||
41 | led0: user1 { | 42 | led0: user1 { |
42 | label = "user1"; | 43 | label = "user1"; |
43 | gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ | 44 | gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 -> MX6_PANLEDG */ |
44 | default-state = "on"; | 45 | default-state = "on"; |
45 | linux,default-trigger = "heartbeat"; | 46 | linux,default-trigger = "heartbeat"; |
46 | }; | 47 | }; |
47 | 48 | ||
48 | led1: user2 { | 49 | led1: user2 { |
49 | label = "user2"; | 50 | label = "user2"; |
50 | gpios = <&gpio4 10 0>; /* 106 -> MX6_PANLEDR */ | 51 | gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* 106 -> MX6_PANLEDR */ |
51 | default-state = "off"; | 52 | default-state = "off"; |
52 | }; | 53 | }; |
53 | 54 | ||
54 | led2: user3 { | 55 | led2: user3 { |
55 | label = "user3"; | 56 | label = "user3"; |
56 | gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ | 57 | gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* 111 -> MX6_LOCLED# */ |
57 | default-state = "off"; | 58 | default-state = "off"; |
58 | }; | 59 | }; |
59 | }; | 60 | }; |
@@ -64,7 +65,7 @@ | |||
64 | 65 | ||
65 | pps { | 66 | pps { |
66 | compatible = "pps-gpio"; | 67 | compatible = "pps-gpio"; |
67 | gpios = <&gpio1 5 0>; | 68 | gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; |
68 | status = "okay"; | 69 | status = "okay"; |
69 | }; | 70 | }; |
70 | 71 | ||
@@ -106,7 +107,7 @@ | |||
106 | regulator-name = "usb_otg_vbus"; | 107 | regulator-name = "usb_otg_vbus"; |
107 | regulator-min-microvolt = <5000000>; | 108 | regulator-min-microvolt = <5000000>; |
108 | regulator-max-microvolt = <5000000>; | 109 | regulator-max-microvolt = <5000000>; |
109 | gpio = <&gpio3 22 0>; | 110 | gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; |
110 | enable-active-high; | 111 | enable-active-high; |
111 | }; | 112 | }; |
112 | }; | 113 | }; |
@@ -134,7 +135,7 @@ | |||
134 | 135 | ||
135 | &ecspi1 { | 136 | &ecspi1 { |
136 | fsl,spi-num-chipselects = <1>; | 137 | fsl,spi-num-chipselects = <1>; |
137 | cs-gpios = <&gpio3 19 0>; | 138 | cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; |
138 | pinctrl-names = "default"; | 139 | pinctrl-names = "default"; |
139 | pinctrl-0 = <&pinctrl_ecspi1>; | 140 | pinctrl-0 = <&pinctrl_ecspi1>; |
140 | status = "okay"; | 141 | status = "okay"; |
@@ -150,7 +151,7 @@ | |||
150 | pinctrl-names = "default"; | 151 | pinctrl-names = "default"; |
151 | pinctrl-0 = <&pinctrl_enet>; | 152 | pinctrl-0 = <&pinctrl_enet>; |
152 | phy-mode = "rgmii"; | 153 | phy-mode = "rgmii"; |
153 | phy-reset-gpios = <&gpio1 30 0>; | 154 | phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; |
154 | status = "okay"; | 155 | status = "okay"; |
155 | }; | 156 | }; |
156 | 157 | ||
@@ -331,8 +332,8 @@ | |||
331 | compatible = "eeti,egalax_ts"; | 332 | compatible = "eeti,egalax_ts"; |
332 | reg = <0x04>; | 333 | reg = <0x04>; |
333 | interrupt-parent = <&gpio7>; | 334 | interrupt-parent = <&gpio7>; |
334 | interrupts = <12 2>; /* gpio7_12 active low */ | 335 | interrupts = <12 2>; |
335 | wakeup-gpios = <&gpio7 12 0>; | 336 | wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; |
336 | }; | 337 | }; |
337 | }; | 338 | }; |
338 | 339 | ||
@@ -462,7 +463,7 @@ | |||
462 | }; | 463 | }; |
463 | 464 | ||
464 | &pcie { | 465 | &pcie { |
465 | reset-gpio = <&gpio1 29 0>; | 466 | reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>; |
466 | status = "okay"; | 467 | status = "okay"; |
467 | 468 | ||
468 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ | 469 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ |
@@ -508,7 +509,7 @@ | |||
508 | &usdhc3 { | 509 | &usdhc3 { |
509 | pinctrl-names = "default"; | 510 | pinctrl-names = "default"; |
510 | pinctrl-0 = <&pinctrl_usdhc3>; | 511 | pinctrl-0 = <&pinctrl_usdhc3>; |
511 | cd-gpios = <&gpio7 0 0>; | 512 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
512 | vmmc-supply = <®_3p3v>; | 513 | vmmc-supply = <®_3p3v>; |
513 | status = "okay"; | 514 | status = "okay"; |
514 | }; | 515 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi index 482ef28885a1..fa2cae4d57d0 100644 --- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | |||
@@ -9,6 +9,8 @@ | |||
9 | * http://www.gnu.org/copyleft/gpl.html | 9 | * http://www.gnu.org/copyleft/gpl.html |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/gpio/gpio.h> | ||
13 | |||
12 | / { | 14 | / { |
13 | /* these are used by bootloader for disabling nodes */ | 15 | /* these are used by bootloader for disabling nodes */ |
14 | aliases { | 16 | aliases { |
@@ -28,14 +30,14 @@ | |||
28 | 30 | ||
29 | led0: user1 { | 31 | led0: user1 { |
30 | label = "user1"; | 32 | label = "user1"; |
31 | gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ | 33 | gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */ |
32 | default-state = "on"; | 34 | default-state = "on"; |
33 | linux,default-trigger = "heartbeat"; | 35 | linux,default-trigger = "heartbeat"; |
34 | }; | 36 | }; |
35 | 37 | ||
36 | led1: user2 { | 38 | led1: user2 { |
37 | label = "user2"; | 39 | label = "user2"; |
38 | gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ | 40 | gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */ |
39 | default-state = "off"; | 41 | default-state = "off"; |
40 | }; | 42 | }; |
41 | }; | 43 | }; |
@@ -46,7 +48,7 @@ | |||
46 | 48 | ||
47 | pps { | 49 | pps { |
48 | compatible = "pps-gpio"; | 50 | compatible = "pps-gpio"; |
49 | gpios = <&gpio1 26 0>; | 51 | gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; |
50 | status = "okay"; | 52 | status = "okay"; |
51 | }; | 53 | }; |
52 | 54 | ||
@@ -79,7 +81,7 @@ | |||
79 | regulator-name = "usb_otg_vbus"; | 81 | regulator-name = "usb_otg_vbus"; |
80 | regulator-min-microvolt = <5000000>; | 82 | regulator-min-microvolt = <5000000>; |
81 | regulator-max-microvolt = <5000000>; | 83 | regulator-max-microvolt = <5000000>; |
82 | gpio = <&gpio3 22 0>; | 84 | gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; |
83 | enable-active-high; | 85 | enable-active-high; |
84 | }; | 86 | }; |
85 | }; | 87 | }; |
@@ -89,7 +91,7 @@ | |||
89 | pinctrl-names = "default"; | 91 | pinctrl-names = "default"; |
90 | pinctrl-0 = <&pinctrl_enet>; | 92 | pinctrl-0 = <&pinctrl_enet>; |
91 | phy-mode = "rgmii"; | 93 | phy-mode = "rgmii"; |
92 | phy-reset-gpios = <&gpio1 30 0>; | 94 | phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; |
93 | status = "okay"; | 95 | status = "okay"; |
94 | }; | 96 | }; |
95 | 97 | ||
@@ -279,7 +281,7 @@ | |||
279 | }; | 281 | }; |
280 | 282 | ||
281 | &pcie { | 283 | &pcie { |
282 | reset-gpio = <&gpio1 0 0>; | 284 | reset-gpio = <&gpio1 0 GPIO_ACTIVE_LOW>; |
283 | status = "okay"; | 285 | status = "okay"; |
284 | }; | 286 | }; |
285 | 287 | ||
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi index f8c4ab492d8e..53f4a0bd53ba 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | |||
@@ -9,6 +9,8 @@ | |||
9 | * http://www.gnu.org/copyleft/gpl.html | 9 | * http://www.gnu.org/copyleft/gpl.html |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/gpio/gpio.h> | ||
13 | |||
12 | / { | 14 | / { |
13 | /* these are used by bootloader for disabling nodes */ | 15 | /* these are used by bootloader for disabling nodes */ |
14 | aliases { | 16 | aliases { |
@@ -37,20 +39,20 @@ | |||
37 | 39 | ||
38 | led0: user1 { | 40 | led0: user1 { |
39 | label = "user1"; | 41 | label = "user1"; |
40 | gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ | 42 | gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */ |
41 | default-state = "on"; | 43 | default-state = "on"; |
42 | linux,default-trigger = "heartbeat"; | 44 | linux,default-trigger = "heartbeat"; |
43 | }; | 45 | }; |
44 | 46 | ||
45 | led1: user2 { | 47 | led1: user2 { |
46 | label = "user2"; | 48 | label = "user2"; |
47 | gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ | 49 | gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */ |
48 | default-state = "off"; | 50 | default-state = "off"; |
49 | }; | 51 | }; |
50 | 52 | ||
51 | led2: user3 { | 53 | led2: user3 { |
52 | label = "user3"; | 54 | label = "user3"; |
53 | gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */ | 55 | gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */ |
54 | default-state = "off"; | 56 | default-state = "off"; |
55 | }; | 57 | }; |
56 | }; | 58 | }; |
@@ -61,7 +63,7 @@ | |||
61 | 63 | ||
62 | pps { | 64 | pps { |
63 | compatible = "pps-gpio"; | 65 | compatible = "pps-gpio"; |
64 | gpios = <&gpio1 26 0>; | 66 | gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; |
65 | status = "okay"; | 67 | status = "okay"; |
66 | }; | 68 | }; |
67 | 69 | ||
@@ -113,7 +115,7 @@ | |||
113 | regulator-name = "usb_otg_vbus"; | 115 | regulator-name = "usb_otg_vbus"; |
114 | regulator-min-microvolt = <5000000>; | 116 | regulator-min-microvolt = <5000000>; |
115 | regulator-max-microvolt = <5000000>; | 117 | regulator-max-microvolt = <5000000>; |
116 | gpio = <&gpio3 22 0>; | 118 | gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; |
117 | enable-active-high; | 119 | enable-active-high; |
118 | }; | 120 | }; |
119 | }; | 121 | }; |
@@ -143,7 +145,7 @@ | |||
143 | pinctrl-names = "default"; | 145 | pinctrl-names = "default"; |
144 | pinctrl-0 = <&pinctrl_enet>; | 146 | pinctrl-0 = <&pinctrl_enet>; |
145 | phy-mode = "rgmii"; | 147 | phy-mode = "rgmii"; |
146 | phy-reset-gpios = <&gpio1 30 0>; | 148 | phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; |
147 | status = "okay"; | 149 | status = "okay"; |
148 | }; | 150 | }; |
149 | 151 | ||
@@ -226,8 +228,8 @@ | |||
226 | compatible = "eeti,egalax_ts"; | 228 | compatible = "eeti,egalax_ts"; |
227 | reg = <0x04>; | 229 | reg = <0x04>; |
228 | interrupt-parent = <&gpio7>; | 230 | interrupt-parent = <&gpio7>; |
229 | interrupts = <12 2>; /* gpio7_12 active low */ | 231 | interrupts = <12 2>; |
230 | wakeup-gpios = <&gpio7 12 0>; | 232 | wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; |
231 | }; | 233 | }; |
232 | }; | 234 | }; |
233 | 235 | ||
@@ -402,7 +404,7 @@ | |||
402 | }; | 404 | }; |
403 | 405 | ||
404 | &pcie { | 406 | &pcie { |
405 | reset-gpio = <&gpio1 29 0>; | 407 | reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>; |
406 | status = "okay"; | 408 | status = "okay"; |
407 | }; | 409 | }; |
408 | 410 | ||
@@ -449,7 +451,7 @@ | |||
449 | &usdhc3 { | 451 | &usdhc3 { |
450 | pinctrl-names = "default"; | 452 | pinctrl-names = "default"; |
451 | pinctrl-0 = <&pinctrl_usdhc3>; | 453 | pinctrl-0 = <&pinctrl_usdhc3>; |
452 | cd-gpios = <&gpio7 0 0>; | 454 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; |
453 | vmmc-supply = <®_3p3v>; | 455 | vmmc-supply = <®_3p3v>; |
454 | status = "okay"; | 456 | status = "okay"; |
455 | }; | 457 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi index 01edfd997013..2074df6f8095 100644 --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | |||
@@ -9,6 +9,8 @@ | |||
9 | * http://www.gnu.org/copyleft/gpl.html | 9 | * http://www.gnu.org/copyleft/gpl.html |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/gpio/gpio.h> | ||
13 | |||
12 | / { | 14 | / { |
13 | /* these are used by bootloader for disabling nodes */ | 15 | /* these are used by bootloader for disabling nodes */ |
14 | aliases { | 16 | aliases { |
@@ -38,20 +40,20 @@ | |||
38 | 40 | ||
39 | led0: user1 { | 41 | led0: user1 { |
40 | label = "user1"; | 42 | label = "user1"; |
41 | gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ | 43 | gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */ |
42 | default-state = "on"; | 44 | default-state = "on"; |
43 | linux,default-trigger = "heartbeat"; | 45 | linux,default-trigger = "heartbeat"; |
44 | }; | 46 | }; |
45 | 47 | ||
46 | led1: user2 { | 48 | led1: user2 { |
47 | label = "user2"; | 49 | label = "user2"; |
48 | gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ | 50 | gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */ |
49 | default-state = "off"; | 51 | default-state = "off"; |
50 | }; | 52 | }; |
51 | 53 | ||
52 | led2: user3 { | 54 | led2: user3 { |
53 | label = "user3"; | 55 | label = "user3"; |
54 | gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ | 56 | gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */ |
55 | default-state = "off"; | 57 | default-state = "off"; |
56 | }; | 58 | }; |
57 | }; | 59 | }; |
@@ -62,7 +64,7 @@ | |||
62 | 64 | ||
63 | pps { | 65 | pps { |
64 | compatible = "pps-gpio"; | 66 | compatible = "pps-gpio"; |
65 | gpios = <&gpio1 26 0>; | 67 | gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; |
66 | status = "okay"; | 68 | status = "okay"; |
67 | }; | 69 | }; |
68 | 70 | ||
@@ -114,7 +116,7 @@ | |||
114 | regulator-name = "usb_otg_vbus"; | 116 | regulator-name = "usb_otg_vbus"; |
115 | regulator-min-microvolt = <5000000>; | 117 | regulator-min-microvolt = <5000000>; |
116 | regulator-max-microvolt = <5000000>; | 118 | regulator-max-microvolt = <5000000>; |
117 | gpio = <&gpio3 22 0>; | 119 | gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; |
118 | enable-active-high; | 120 | enable-active-high; |
119 | }; | 121 | }; |
120 | }; | 122 | }; |
@@ -150,7 +152,7 @@ | |||
150 | pinctrl-names = "default"; | 152 | pinctrl-names = "default"; |
151 | pinctrl-0 = <&pinctrl_enet>; | 153 | pinctrl-0 = <&pinctrl_enet>; |
152 | phy-mode = "rgmii"; | 154 | phy-mode = "rgmii"; |
153 | phy-reset-gpios = <&gpio1 30 0>; | 155 | phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; |
154 | status = "okay"; | 156 | status = "okay"; |
155 | }; | 157 | }; |
156 | 158 | ||
@@ -233,8 +235,8 @@ | |||
233 | compatible = "eeti,egalax_ts"; | 235 | compatible = "eeti,egalax_ts"; |
234 | reg = <0x04>; | 236 | reg = <0x04>; |
235 | interrupt-parent = <&gpio1>; | 237 | interrupt-parent = <&gpio1>; |
236 | interrupts = <11 2>; /* gpio1_11 active low */ | 238 | interrupts = <11 2>; |
237 | wakeup-gpios = <&gpio1 11 0>; | 239 | wakeup-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; |
238 | }; | 240 | }; |
239 | }; | 241 | }; |
240 | 242 | ||
@@ -418,7 +420,7 @@ | |||
418 | }; | 420 | }; |
419 | 421 | ||
420 | &pcie { | 422 | &pcie { |
421 | reset-gpio = <&gpio1 29 0>; | 423 | reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>; |
422 | status = "okay"; | 424 | status = "okay"; |
423 | 425 | ||
424 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ | 426 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ |
@@ -470,7 +472,7 @@ | |||
470 | &usdhc3 { | 472 | &usdhc3 { |
471 | pinctrl-names = "default"; | 473 | pinctrl-names = "default"; |
472 | pinctrl-0 = <&pinctrl_usdhc3>; | 474 | pinctrl-0 = <&pinctrl_usdhc3>; |
473 | cd-gpios = <&gpio7 0 0>; | 475 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; |
474 | vmmc-supply = <®_3p3v>; | 476 | vmmc-supply = <®_3p3v>; |
475 | status = "okay"; | 477 | status = "okay"; |
476 | }; | 478 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi index fab9c7a8f878..ab7827abd71b 100644 --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | |||
@@ -9,6 +9,8 @@ | |||
9 | * http://www.gnu.org/copyleft/gpl.html | 9 | * http://www.gnu.org/copyleft/gpl.html |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/gpio/gpio.h> | ||
13 | |||
12 | / { | 14 | / { |
13 | /* these are used by bootloader for disabling nodes */ | 15 | /* these are used by bootloader for disabling nodes */ |
14 | aliases { | 16 | aliases { |
@@ -38,20 +40,20 @@ | |||
38 | 40 | ||
39 | led0: user1 { | 41 | led0: user1 { |
40 | label = "user1"; | 42 | label = "user1"; |
41 | gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */ | 43 | gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDG */ |
42 | default-state = "on"; | 44 | default-state = "on"; |
43 | linux,default-trigger = "heartbeat"; | 45 | linux,default-trigger = "heartbeat"; |
44 | }; | 46 | }; |
45 | 47 | ||
46 | led1: user2 { | 48 | led1: user2 { |
47 | label = "user2"; | 49 | label = "user2"; |
48 | gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */ | 50 | gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; /* MX6_PANLEDR */ |
49 | default-state = "off"; | 51 | default-state = "off"; |
50 | }; | 52 | }; |
51 | 53 | ||
52 | led2: user3 { | 54 | led2: user3 { |
53 | label = "user3"; | 55 | label = "user3"; |
54 | gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */ | 56 | gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* MX6_LOCLED# */ |
55 | default-state = "off"; | 57 | default-state = "off"; |
56 | }; | 58 | }; |
57 | }; | 59 | }; |
@@ -62,7 +64,7 @@ | |||
62 | 64 | ||
63 | pps { | 65 | pps { |
64 | compatible = "pps-gpio"; | 66 | compatible = "pps-gpio"; |
65 | gpios = <&gpio1 26 0>; | 67 | gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>; |
66 | status = "okay"; | 68 | status = "okay"; |
67 | }; | 69 | }; |
68 | 70 | ||
@@ -104,7 +106,7 @@ | |||
104 | regulator-name = "usb_otg_vbus"; | 106 | regulator-name = "usb_otg_vbus"; |
105 | regulator-min-microvolt = <5000000>; | 107 | regulator-min-microvolt = <5000000>; |
106 | regulator-max-microvolt = <5000000>; | 108 | regulator-max-microvolt = <5000000>; |
107 | gpio = <&gpio3 22 0>; | 109 | gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; |
108 | enable-active-high; | 110 | enable-active-high; |
109 | }; | 111 | }; |
110 | }; | 112 | }; |
@@ -140,7 +142,7 @@ | |||
140 | pinctrl-names = "default"; | 142 | pinctrl-names = "default"; |
141 | pinctrl-0 = <&pinctrl_enet>; | 143 | pinctrl-0 = <&pinctrl_enet>; |
142 | phy-mode = "rgmii"; | 144 | phy-mode = "rgmii"; |
143 | phy-reset-gpios = <&gpio1 30 0>; | 145 | phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; |
144 | status = "okay"; | 146 | status = "okay"; |
145 | }; | 147 | }; |
146 | 148 | ||
@@ -322,8 +324,8 @@ | |||
322 | compatible = "eeti,egalax_ts"; | 324 | compatible = "eeti,egalax_ts"; |
323 | reg = <0x04>; | 325 | reg = <0x04>; |
324 | interrupt-parent = <&gpio7>; | 326 | interrupt-parent = <&gpio7>; |
325 | interrupts = <12 2>; /* gpio7_12 active low */ | 327 | interrupts = <12 2>; |
326 | wakeup-gpios = <&gpio7 12 0>; | 328 | wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; |
327 | }; | 329 | }; |
328 | }; | 330 | }; |
329 | 331 | ||
@@ -501,7 +503,7 @@ | |||
501 | }; | 503 | }; |
502 | 504 | ||
503 | &pcie { | 505 | &pcie { |
504 | reset-gpio = <&gpio1 29 0>; | 506 | reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>; |
505 | status = "okay"; | 507 | status = "okay"; |
506 | 508 | ||
507 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ | 509 | eth1: sky2@8 { /* MAC/PHY on bus 8 */ |
@@ -557,7 +559,7 @@ | |||
557 | &usdhc3 { | 559 | &usdhc3 { |
558 | pinctrl-names = "default"; | 560 | pinctrl-names = "default"; |
559 | pinctrl-0 = <&pinctrl_usdhc3>; | 561 | pinctrl-0 = <&pinctrl_usdhc3>; |
560 | cd-gpios = <&gpio7 0 0>; | 562 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; |
561 | vmmc-supply = <®_3p3v>; | 563 | vmmc-supply = <®_3p3v>; |
562 | status = "okay"; | 564 | status = "okay"; |
563 | }; | 565 | }; |