diff options
Diffstat (limited to 'arch')
33 files changed, 144 insertions, 137 deletions
diff --git a/arch/arm/boot/dts/aks-cdu.dts b/arch/arm/boot/dts/aks-cdu.dts index 08b82a420ff8..54cb5cf8604a 100644 --- a/arch/arm/boot/dts/aks-cdu.dts +++ b/arch/arm/boot/dts/aks-cdu.dts | |||
@@ -46,7 +46,7 @@ | |||
46 | }; | 46 | }; |
47 | 47 | ||
48 | usb1: gadget@fffa4000 { | 48 | usb1: gadget@fffa4000 { |
49 | atmel,vbus-gpio = <&pioC 15 0>; | 49 | atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>; |
50 | status = "okay"; | 50 | status = "okay"; |
51 | }; | 51 | }; |
52 | }; | 52 | }; |
@@ -90,23 +90,23 @@ | |||
90 | compatible = "gpio-leds"; | 90 | compatible = "gpio-leds"; |
91 | 91 | ||
92 | red { | 92 | red { |
93 | gpios = <&pioC 10 0>; | 93 | gpios = <&pioC 10 GPIO_ACTIVE_HIGH>; |
94 | linux,default-trigger = "none"; | 94 | linux,default-trigger = "none"; |
95 | }; | 95 | }; |
96 | 96 | ||
97 | green { | 97 | green { |
98 | gpios = <&pioA 5 1>; | 98 | gpios = <&pioA 5 GPIO_ACTIVE_LOW>; |
99 | linux,default-trigger = "none"; | 99 | linux,default-trigger = "none"; |
100 | default-state = "on"; | 100 | default-state = "on"; |
101 | }; | 101 | }; |
102 | 102 | ||
103 | yellow { | 103 | yellow { |
104 | gpios = <&pioB 20 1>; | 104 | gpios = <&pioB 20 GPIO_ACTIVE_LOW>; |
105 | linux,default-trigger = "none"; | 105 | linux,default-trigger = "none"; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | blue { | 108 | blue { |
109 | gpios = <&pioB 21 1>; | 109 | gpios = <&pioB 21 GPIO_ACTIVE_LOW>; |
110 | linux,default-trigger = "none"; | 110 | linux,default-trigger = "none"; |
111 | }; | 111 | }; |
112 | }; | 112 | }; |
diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts index b7658920cfd5..3a1de9eb5111 100644 --- a/arch/arm/boot/dts/animeo_ip.dts +++ b/arch/arm/boot/dts/animeo_ip.dts | |||
@@ -123,7 +123,7 @@ | |||
123 | 123 | ||
124 | usb0: ohci@00500000 { | 124 | usb0: ohci@00500000 { |
125 | num-ports = <2>; | 125 | num-ports = <2>; |
126 | atmel,vbus-gpio = <&pioB 15 1>; | 126 | atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>; |
127 | status = "okay"; | 127 | status = "okay"; |
128 | }; | 128 | }; |
129 | }; | 129 | }; |
@@ -133,23 +133,23 @@ | |||
133 | 133 | ||
134 | power_green { | 134 | power_green { |
135 | label = "power_green"; | 135 | label = "power_green"; |
136 | gpios = <&pioC 17 0>; | 136 | gpios = <&pioC 17 GPIO_ACTIVE_HIGH>; |
137 | linux,default-trigger = "heartbeat"; | 137 | linux,default-trigger = "heartbeat"; |
138 | }; | 138 | }; |
139 | 139 | ||
140 | power_red { | 140 | power_red { |
141 | label = "power_red"; | 141 | label = "power_red"; |
142 | gpios = <&pioA 2 0>; | 142 | gpios = <&pioA 2 GPIO_ACTIVE_HIGH>; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | tx_green { | 145 | tx_green { |
146 | label = "tx_green"; | 146 | label = "tx_green"; |
147 | gpios = <&pioC 19 0>; | 147 | gpios = <&pioC 19 GPIO_ACTIVE_HIGH>; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | tx_red { | 150 | tx_red { |
151 | label = "tx_red"; | 151 | label = "tx_red"; |
152 | gpios = <&pioC 18 0>; | 152 | gpios = <&pioC 18 GPIO_ACTIVE_HIGH>; |
153 | }; | 153 | }; |
154 | }; | 154 | }; |
155 | 155 | ||
@@ -160,21 +160,21 @@ | |||
160 | 160 | ||
161 | keyswitch_in { | 161 | keyswitch_in { |
162 | label = "keyswitch_in"; | 162 | label = "keyswitch_in"; |
163 | gpios = <&pioB 1 0>; | 163 | gpios = <&pioB 1 GPIO_ACTIVE_HIGH>; |
164 | linux,code = <28>; | 164 | linux,code = <28>; |
165 | gpio-key,wakeup; | 165 | gpio-key,wakeup; |
166 | }; | 166 | }; |
167 | 167 | ||
168 | error_in { | 168 | error_in { |
169 | label = "error_in"; | 169 | label = "error_in"; |
170 | gpios = <&pioB 2 0>; | 170 | gpios = <&pioB 2 GPIO_ACTIVE_HIGH>; |
171 | linux,code = <29>; | 171 | linux,code = <29>; |
172 | gpio-key,wakeup; | 172 | gpio-key,wakeup; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | btn { | 175 | btn { |
176 | label = "btn"; | 176 | label = "btn"; |
177 | gpios = <&pioC 23 0>; | 177 | gpios = <&pioC 23 GPIO_ACTIVE_HIGH>; |
178 | linux,code = <31>; | 178 | linux,code = <31>; |
179 | gpio-key,wakeup; | 179 | gpio-key,wakeup; |
180 | }; | 180 | }; |
diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts index 09beeb4a72f5..5ede7678f298 100644 --- a/arch/arm/boot/dts/at91-ariag25.dts +++ b/arch/arm/boot/dts/at91-ariag25.dts | |||
@@ -156,7 +156,7 @@ | |||
156 | /* little green LED in middle of Aria G25 module */ | 156 | /* little green LED in middle of Aria G25 module */ |
157 | aria_led { | 157 | aria_led { |
158 | label = "aria_led"; | 158 | label = "aria_led"; |
159 | gpios = <&pioB 8 0>; /* PB8 */ | 159 | gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */ |
160 | linux,default-trigger = "heartbeat"; | 160 | linux,default-trigger = "heartbeat"; |
161 | }; | 161 | }; |
162 | 162 | ||
@@ -164,7 +164,7 @@ | |||
164 | 164 | ||
165 | onewire@0 { | 165 | onewire@0 { |
166 | compatible = "w1-gpio"; | 166 | compatible = "w1-gpio"; |
167 | gpios = <&pioA 21 1>; | 167 | gpios = <&pioA 21 GPIO_ACTIVE_LOW>; |
168 | pinctrl-names = "default"; | 168 | pinctrl-names = "default"; |
169 | pinctrl-0 = <&pinctrl_w1_0>; | 169 | pinctrl-0 = <&pinctrl_w1_0>; |
170 | }; | 170 | }; |
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi index 6329679c6920..7ebfe6c6c360 100644 --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "skeleton.dtsi" | 13 | #include "skeleton.dtsi" |
14 | #include <dt-bindings/gpio/gpio.h> | ||
14 | 15 | ||
15 | / { | 16 | / { |
16 | model = "Atmel AT91RM9200 family SoC"; | 17 | model = "Atmel AT91RM9200 family SoC"; |
@@ -503,9 +504,9 @@ | |||
503 | pinctrl-names = "default"; | 504 | pinctrl-names = "default"; |
504 | pinctrl-0 = <&pinctrl_nand>; | 505 | pinctrl-0 = <&pinctrl_nand>; |
505 | nand-ecc-mode = "soft"; | 506 | nand-ecc-mode = "soft"; |
506 | gpios = <&pioC 2 0 | 507 | gpios = <&pioC 2 GPIO_ACTIVE_HIGH |
507 | 0 | 508 | 0 |
508 | &pioB 1 0 | 509 | &pioB 1 GPIO_ACTIVE_HIGH |
509 | >; | 510 | >; |
510 | status = "disabled"; | 511 | status = "disabled"; |
511 | }; | 512 | }; |
@@ -520,8 +521,8 @@ | |||
520 | 521 | ||
521 | i2c@0 { | 522 | i2c@0 { |
522 | compatible = "i2c-gpio"; | 523 | compatible = "i2c-gpio"; |
523 | gpios = <&pioA 25 0 /* sda */ | 524 | gpios = <&pioA 25 GPIO_ACTIVE_HIGH /* sda */ |
524 | &pioA 26 0 /* scl */ | 525 | &pioA 26 GPIO_ACTIVE_HIGH /* scl */ |
525 | >; | 526 | >; |
526 | i2c-gpio,sda-open-drain; | 527 | i2c-gpio,sda-open-drain; |
527 | i2c-gpio,scl-open-drain; | 528 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts index 5dffeb3aca33..14058125d123 100644 --- a/arch/arm/boot/dts/at91rm9200ek.dts +++ b/arch/arm/boot/dts/at91rm9200ek.dts | |||
@@ -50,7 +50,7 @@ | |||
50 | }; | 50 | }; |
51 | 51 | ||
52 | usb1: gadget@fffb0000 { | 52 | usb1: gadget@fffb0000 { |
53 | atmel,vbus-gpio = <&pioD 4 0>; | 53 | atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; |
54 | status = "okay"; | 54 | status = "okay"; |
55 | }; | 55 | }; |
56 | }; | 56 | }; |
@@ -66,19 +66,19 @@ | |||
66 | 66 | ||
67 | ds2 { | 67 | ds2 { |
68 | label = "green"; | 68 | label = "green"; |
69 | gpios = <&pioB 0 0x1>; | 69 | gpios = <&pioB 0 GPIO_ACTIVE_LOW>; |
70 | linux,default-trigger = "mmc0"; | 70 | linux,default-trigger = "mmc0"; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | ds4 { | 73 | ds4 { |
74 | label = "yellow"; | 74 | label = "yellow"; |
75 | gpios = <&pioB 1 0x1>; | 75 | gpios = <&pioB 1 GPIO_ACTIVE_LOW>; |
76 | linux,default-trigger = "heartbeat"; | 76 | linux,default-trigger = "heartbeat"; |
77 | }; | 77 | }; |
78 | 78 | ||
79 | ds6 { | 79 | ds6 { |
80 | label = "red"; | 80 | label = "red"; |
81 | gpios = <&pioB 2 0x1>; | 81 | gpios = <&pioB 2 GPIO_ACTIVE_LOW>; |
82 | }; | 82 | }; |
83 | }; | 83 | }; |
84 | }; | 84 | }; |
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index b130b3eed1e5..717625d003ef 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | #include <dt-bindings/gpio/gpio.h> | ||
12 | 13 | ||
13 | / { | 14 | / { |
14 | model = "Atmel AT91SAM9260 family SoC"; | 15 | model = "Atmel AT91SAM9260 family SoC"; |
@@ -567,8 +568,8 @@ | |||
567 | atmel,nand-cmd-offset = <22>; | 568 | atmel,nand-cmd-offset = <22>; |
568 | pinctrl-names = "default"; | 569 | pinctrl-names = "default"; |
569 | pinctrl-0 = <&pinctrl_nand>; | 570 | pinctrl-0 = <&pinctrl_nand>; |
570 | gpios = <&pioC 13 0 | 571 | gpios = <&pioC 13 GPIO_ACTIVE_HIGH |
571 | &pioC 14 0 | 572 | &pioC 14 GPIO_ACTIVE_HIGH |
572 | 0 | 573 | 0 |
573 | >; | 574 | >; |
574 | status = "disabled"; | 575 | status = "disabled"; |
@@ -584,8 +585,8 @@ | |||
584 | 585 | ||
585 | i2c@0 { | 586 | i2c@0 { |
586 | compatible = "i2c-gpio"; | 587 | compatible = "i2c-gpio"; |
587 | gpios = <&pioA 23 0 /* sda */ | 588 | gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */ |
588 | &pioA 24 0 /* scl */ | 589 | &pioA 24 GPIO_ACTIVE_HIGH /* scl */ |
589 | >; | 590 | >; |
590 | i2c-gpio,sda-open-drain; | 591 | i2c-gpio,sda-open-drain; |
591 | i2c-gpio,scl-open-drain; | 592 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 89f4e9422258..5edfadf20482 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "skeleton.dtsi" | 9 | #include "skeleton.dtsi" |
10 | #include <dt-bindings/gpio/gpio.h> | ||
10 | 11 | ||
11 | / { | 12 | / { |
12 | model = "Atmel AT91SAM9263 family SoC"; | 13 | model = "Atmel AT91SAM9263 family SoC"; |
@@ -515,8 +516,8 @@ | |||
515 | atmel,nand-cmd-offset = <22>; | 516 | atmel,nand-cmd-offset = <22>; |
516 | pinctrl-names = "default"; | 517 | pinctrl-names = "default"; |
517 | pinctrl-0 = <&pinctrl_nand>; | 518 | pinctrl-0 = <&pinctrl_nand>; |
518 | gpios = <&pioA 22 0 | 519 | gpios = <&pioA 22 GPIO_ACTIVE_HIGH |
519 | &pioD 15 0 | 520 | &pioD 15 GPIO_ACTIVE_HIGH |
520 | 0 | 521 | 0 |
521 | >; | 522 | >; |
522 | status = "disabled"; | 523 | status = "disabled"; |
@@ -532,8 +533,8 @@ | |||
532 | 533 | ||
533 | i2c@0 { | 534 | i2c@0 { |
534 | compatible = "i2c-gpio"; | 535 | compatible = "i2c-gpio"; |
535 | gpios = <&pioB 4 0 /* sda */ | 536 | gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */ |
536 | &pioB 5 0 /* scl */ | 537 | &pioB 5 GPIO_ACTIVE_HIGH /* scl */ |
537 | >; | 538 | >; |
538 | i2c-gpio,sda-open-drain; | 539 | i2c-gpio,sda-open-drain; |
539 | i2c-gpio,scl-open-drain; | 540 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts index 6b646d47d504..e1942ec04af3 100644 --- a/arch/arm/boot/dts/at91sam9263ek.dts +++ b/arch/arm/boot/dts/at91sam9263ek.dts | |||
@@ -51,7 +51,7 @@ | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | usb1: gadget@fff78000 { | 53 | usb1: gadget@fff78000 { |
54 | atmel,vbus-gpio = <&pioA 25 0>; | 54 | atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>; |
55 | status = "okay"; | 55 | status = "okay"; |
56 | }; | 56 | }; |
57 | 57 | ||
@@ -65,8 +65,8 @@ | |||
65 | slot@0 { | 65 | slot@0 { |
66 | reg = <0>; | 66 | reg = <0>; |
67 | bus-width = <4>; | 67 | bus-width = <4>; |
68 | cd-gpios = <&pioE 18 0>; | 68 | cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>; |
69 | wp-gpios = <&pioE 19 0>; | 69 | wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>; |
70 | }; | 70 | }; |
71 | }; | 71 | }; |
72 | 72 | ||
@@ -141,8 +141,8 @@ | |||
141 | usb0: ohci@00a00000 { | 141 | usb0: ohci@00a00000 { |
142 | num-ports = <2>; | 142 | num-ports = <2>; |
143 | status = "okay"; | 143 | status = "okay"; |
144 | atmel,vbus-gpio = <&pioA 24 0 | 144 | atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH |
145 | &pioA 21 0 | 145 | &pioA 21 GPIO_ACTIVE_HIGH |
146 | >; | 146 | >; |
147 | }; | 147 | }; |
148 | }; | 148 | }; |
@@ -152,13 +152,13 @@ | |||
152 | 152 | ||
153 | d3 { | 153 | d3 { |
154 | label = "d3"; | 154 | label = "d3"; |
155 | gpios = <&pioB 7 0>; | 155 | gpios = <&pioB 7 GPIO_ACTIVE_HIGH>; |
156 | linux,default-trigger = "heartbeat"; | 156 | linux,default-trigger = "heartbeat"; |
157 | }; | 157 | }; |
158 | 158 | ||
159 | d2 { | 159 | d2 { |
160 | label = "d2"; | 160 | label = "d2"; |
161 | gpios = <&pioC 29 1>; | 161 | gpios = <&pioC 29 GPIO_ACTIVE_LOW>; |
162 | linux,default-trigger = "nand-disk"; | 162 | linux,default-trigger = "nand-disk"; |
163 | }; | 163 | }; |
164 | }; | 164 | }; |
@@ -168,14 +168,14 @@ | |||
168 | 168 | ||
169 | left_click { | 169 | left_click { |
170 | label = "left_click"; | 170 | label = "left_click"; |
171 | gpios = <&pioC 5 1>; | 171 | gpios = <&pioC 5 GPIO_ACTIVE_LOW>; |
172 | linux,code = <272>; | 172 | linux,code = <272>; |
173 | gpio-key,wakeup; | 173 | gpio-key,wakeup; |
174 | }; | 174 | }; |
175 | 175 | ||
176 | right_click { | 176 | right_click { |
177 | label = "right_click"; | 177 | label = "right_click"; |
178 | gpios = <&pioC 4 1>; | 178 | gpios = <&pioC 4 GPIO_ACTIVE_LOW>; |
179 | linux,code = <273>; | 179 | linux,code = <273>; |
180 | gpio-key,wakeup; | 180 | gpio-key,wakeup; |
181 | }; | 181 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g20ek.dts b/arch/arm/boot/dts/at91sam9g20ek.dts index 3f15a3fe0f9f..bbfd753112c9 100644 --- a/arch/arm/boot/dts/at91sam9g20ek.dts +++ b/arch/arm/boot/dts/at91sam9g20ek.dts | |||
@@ -17,13 +17,13 @@ | |||
17 | 17 | ||
18 | ds1 { | 18 | ds1 { |
19 | label = "ds1"; | 19 | label = "ds1"; |
20 | gpios = <&pioA 9 0>; | 20 | gpios = <&pioA 9 GPIO_ACTIVE_HIGH>; |
21 | linux,default-trigger = "heartbeat"; | 21 | linux,default-trigger = "heartbeat"; |
22 | }; | 22 | }; |
23 | 23 | ||
24 | ds5 { | 24 | ds5 { |
25 | label = "ds5"; | 25 | label = "ds5"; |
26 | gpios = <&pioA 6 1>; | 26 | gpios = <&pioA 6 GPIO_ACTIVE_LOW>; |
27 | }; | 27 | }; |
28 | }; | 28 | }; |
29 | }; | 29 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts index 942aa109af38..ec108b98c04e 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts +++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts | |||
@@ -23,7 +23,7 @@ | |||
23 | slot@0 { | 23 | slot@0 { |
24 | reg = <0>; | 24 | reg = <0>; |
25 | bus-width = <4>; | 25 | bus-width = <4>; |
26 | cd-gpios = <&pioC 2 0>; | 26 | cd-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>; |
27 | }; | 27 | }; |
28 | }; | 28 | }; |
29 | 29 | ||
@@ -43,13 +43,13 @@ | |||
43 | 43 | ||
44 | ds1 { | 44 | ds1 { |
45 | label = "ds1"; | 45 | label = "ds1"; |
46 | gpios = <&pioB 9 0>; | 46 | gpios = <&pioB 9 GPIO_ACTIVE_HIGH>; |
47 | linux,default-trigger = "heartbeat"; | 47 | linux,default-trigger = "heartbeat"; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | ds5 { | 50 | ds5 { |
51 | label = "ds5"; | 51 | label = "ds5"; |
52 | gpios = <&pioB 8 1>; | 52 | gpios = <&pioB 8 GPIO_ACTIVE_LOW>; |
53 | }; | 53 | }; |
54 | }; | 54 | }; |
55 | }; | 55 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 253960f5c369..79338393caf9 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi | |||
@@ -65,7 +65,7 @@ | |||
65 | }; | 65 | }; |
66 | 66 | ||
67 | usb1: gadget@fffa4000 { | 67 | usb1: gadget@fffa4000 { |
68 | atmel,vbus-gpio = <&pioC 5 0>; | 68 | atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; |
69 | status = "okay"; | 69 | status = "okay"; |
70 | }; | 70 | }; |
71 | 71 | ||
@@ -79,7 +79,7 @@ | |||
79 | slot@1 { | 79 | slot@1 { |
80 | reg = <1>; | 80 | reg = <1>; |
81 | bus-width = <4>; | 81 | bus-width = <4>; |
82 | cd-gpios = <&pioC 9 0>; | 82 | cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>; |
83 | }; | 83 | }; |
84 | }; | 84 | }; |
85 | 85 | ||
@@ -180,14 +180,14 @@ | |||
180 | 180 | ||
181 | btn3 { | 181 | btn3 { |
182 | label = "Button 3"; | 182 | label = "Button 3"; |
183 | gpios = <&pioA 30 1>; | 183 | gpios = <&pioA 30 GPIO_ACTIVE_LOW>; |
184 | linux,code = <0x103>; | 184 | linux,code = <0x103>; |
185 | gpio-key,wakeup; | 185 | gpio-key,wakeup; |
186 | }; | 186 | }; |
187 | 187 | ||
188 | btn4 { | 188 | btn4 { |
189 | label = "Button 4"; | 189 | label = "Button 4"; |
190 | gpios = <&pioA 31 1>; | 190 | gpios = <&pioA 31 GPIO_ACTIVE_LOW>; |
191 | linux,code = <0x104>; | 191 | linux,code = <0x104>; |
192 | gpio-key,wakeup; | 192 | gpio-key,wakeup; |
193 | }; | 193 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index 18ea7610afee..5d7c1f79dc4a 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
13 | #include <dt-bindings/gpio/gpio.h> | ||
13 | 14 | ||
14 | / { | 15 | / { |
15 | model = "Atmel AT91SAM9G45 family SoC"; | 16 | model = "Atmel AT91SAM9G45 family SoC"; |
@@ -592,8 +593,8 @@ | |||
592 | atmel,nand-cmd-offset = <22>; | 593 | atmel,nand-cmd-offset = <22>; |
593 | pinctrl-names = "default"; | 594 | pinctrl-names = "default"; |
594 | pinctrl-0 = <&pinctrl_nand>; | 595 | pinctrl-0 = <&pinctrl_nand>; |
595 | gpios = <&pioC 8 0 | 596 | gpios = <&pioC 8 GPIO_ACTIVE_HIGH |
596 | &pioC 14 0 | 597 | &pioC 14 GPIO_ACTIVE_HIGH |
597 | 0 | 598 | 0 |
598 | >; | 599 | >; |
599 | status = "disabled"; | 600 | status = "disabled"; |
@@ -616,8 +617,8 @@ | |||
616 | 617 | ||
617 | i2c@0 { | 618 | i2c@0 { |
618 | compatible = "i2c-gpio"; | 619 | compatible = "i2c-gpio"; |
619 | gpios = <&pioA 20 0 /* sda */ | 620 | gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */ |
620 | &pioA 21 0 /* scl */ | 621 | &pioA 21 GPIO_ACTIVE_HIGH /* scl */ |
621 | >; | 622 | >; |
622 | i2c-gpio,sda-open-drain; | 623 | i2c-gpio,sda-open-drain; |
623 | i2c-gpio,scl-open-drain; | 624 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index ba1205d9e641..85e9c5e8b23f 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts | |||
@@ -68,7 +68,7 @@ | |||
68 | slot@0 { | 68 | slot@0 { |
69 | reg = <0>; | 69 | reg = <0>; |
70 | bus-width = <4>; | 70 | bus-width = <4>; |
71 | cd-gpios = <&pioD 10 0>; | 71 | cd-gpios = <&pioD 10 GPIO_ACTIVE_HIGH>; |
72 | }; | 72 | }; |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -81,8 +81,8 @@ | |||
81 | slot@0 { | 81 | slot@0 { |
82 | reg = <0>; | 82 | reg = <0>; |
83 | bus-width = <4>; | 83 | bus-width = <4>; |
84 | cd-gpios = <&pioD 11 0>; | 84 | cd-gpios = <&pioD 11 GPIO_ACTIVE_HIGH>; |
85 | wp-gpios = <&pioD 29 0>; | 85 | wp-gpios = <&pioD 29 GPIO_ACTIVE_HIGH>; |
86 | }; | 86 | }; |
87 | }; | 87 | }; |
88 | 88 | ||
@@ -139,8 +139,8 @@ | |||
139 | usb0: ohci@00700000 { | 139 | usb0: ohci@00700000 { |
140 | status = "okay"; | 140 | status = "okay"; |
141 | num-ports = <2>; | 141 | num-ports = <2>; |
142 | atmel,vbus-gpio = <&pioD 1 1 | 142 | atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW |
143 | &pioD 3 1>; | 143 | &pioD 3 GPIO_ACTIVE_LOW>; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | usb1: ehci@00800000 { | 146 | usb1: ehci@00800000 { |
@@ -153,19 +153,19 @@ | |||
153 | 153 | ||
154 | d8 { | 154 | d8 { |
155 | label = "d8"; | 155 | label = "d8"; |
156 | gpios = <&pioD 30 0>; | 156 | gpios = <&pioD 30 GPIO_ACTIVE_HIGH>; |
157 | linux,default-trigger = "heartbeat"; | 157 | linux,default-trigger = "heartbeat"; |
158 | }; | 158 | }; |
159 | 159 | ||
160 | d6 { | 160 | d6 { |
161 | label = "d6"; | 161 | label = "d6"; |
162 | gpios = <&pioD 0 1>; | 162 | gpios = <&pioD 0 GPIO_ACTIVE_LOW>; |
163 | linux,default-trigger = "nand-disk"; | 163 | linux,default-trigger = "nand-disk"; |
164 | }; | 164 | }; |
165 | 165 | ||
166 | d7 { | 166 | d7 { |
167 | label = "d7"; | 167 | label = "d7"; |
168 | gpios = <&pioD 31 1>; | 168 | gpios = <&pioD 31 GPIO_ACTIVE_LOW>; |
169 | linux,default-trigger = "mmc0"; | 169 | linux,default-trigger = "mmc0"; |
170 | }; | 170 | }; |
171 | }; | 171 | }; |
@@ -175,45 +175,45 @@ | |||
175 | 175 | ||
176 | left_click { | 176 | left_click { |
177 | label = "left_click"; | 177 | label = "left_click"; |
178 | gpios = <&pioB 6 1>; | 178 | gpios = <&pioB 6 GPIO_ACTIVE_LOW>; |
179 | linux,code = <272>; | 179 | linux,code = <272>; |
180 | gpio-key,wakeup; | 180 | gpio-key,wakeup; |
181 | }; | 181 | }; |
182 | 182 | ||
183 | right_click { | 183 | right_click { |
184 | label = "right_click"; | 184 | label = "right_click"; |
185 | gpios = <&pioB 7 1>; | 185 | gpios = <&pioB 7 GPIO_ACTIVE_LOW>; |
186 | linux,code = <273>; | 186 | linux,code = <273>; |
187 | gpio-key,wakeup; | 187 | gpio-key,wakeup; |
188 | }; | 188 | }; |
189 | 189 | ||
190 | left { | 190 | left { |
191 | label = "Joystick Left"; | 191 | label = "Joystick Left"; |
192 | gpios = <&pioB 14 1>; | 192 | gpios = <&pioB 14 GPIO_ACTIVE_LOW>; |
193 | linux,code = <105>; | 193 | linux,code = <105>; |
194 | }; | 194 | }; |
195 | 195 | ||
196 | right { | 196 | right { |
197 | label = "Joystick Right"; | 197 | label = "Joystick Right"; |
198 | gpios = <&pioB 15 1>; | 198 | gpios = <&pioB 15 GPIO_ACTIVE_LOW>; |
199 | linux,code = <106>; | 199 | linux,code = <106>; |
200 | }; | 200 | }; |
201 | 201 | ||
202 | up { | 202 | up { |
203 | label = "Joystick Up"; | 203 | label = "Joystick Up"; |
204 | gpios = <&pioB 16 1>; | 204 | gpios = <&pioB 16 GPIO_ACTIVE_LOW>; |
205 | linux,code = <103>; | 205 | linux,code = <103>; |
206 | }; | 206 | }; |
207 | 207 | ||
208 | down { | 208 | down { |
209 | label = "Joystick Down"; | 209 | label = "Joystick Down"; |
210 | gpios = <&pioB 17 1>; | 210 | gpios = <&pioB 17 GPIO_ACTIVE_LOW>; |
211 | linux,code = <108>; | 211 | linux,code = <108>; |
212 | }; | 212 | }; |
213 | 213 | ||
214 | enter { | 214 | enter { |
215 | label = "Joystick Press"; | 215 | label = "Joystick Press"; |
216 | gpios = <&pioB 18 1>; | 216 | gpios = <&pioB 18 GPIO_ACTIVE_LOW>; |
217 | linux,code = <28>; | 217 | linux,code = <28>; |
218 | }; | 218 | }; |
219 | }; | 219 | }; |
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index e8488700c4b4..5205403ca1e3 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
@@ -8,6 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "skeleton.dtsi" | 10 | #include "skeleton.dtsi" |
11 | #include <dt-bindings/gpio/gpio.h> | ||
11 | 12 | ||
12 | / { | 13 | / { |
13 | model = "Atmel AT91SAM9N12 SoC"; | 14 | model = "Atmel AT91SAM9N12 SoC"; |
@@ -438,8 +439,8 @@ | |||
438 | atmel,nand-cmd-offset = <22>; | 439 | atmel,nand-cmd-offset = <22>; |
439 | pinctrl-names = "default"; | 440 | pinctrl-names = "default"; |
440 | pinctrl-0 = <&pinctrl_nand>; | 441 | pinctrl-0 = <&pinctrl_nand>; |
441 | gpios = <&pioD 5 0 | 442 | gpios = <&pioD 5 GPIO_ACTIVE_HIGH |
442 | &pioD 4 0 | 443 | &pioD 4 GPIO_ACTIVE_HIGH |
443 | 0 | 444 | 0 |
444 | >; | 445 | >; |
445 | status = "disabled"; | 446 | status = "disabled"; |
@@ -455,8 +456,8 @@ | |||
455 | 456 | ||
456 | i2c@0 { | 457 | i2c@0 { |
457 | compatible = "i2c-gpio"; | 458 | compatible = "i2c-gpio"; |
458 | gpios = <&pioA 30 0 /* sda */ | 459 | gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */ |
459 | &pioA 31 0 /* scl */ | 460 | &pioA 31 GPIO_ACTIVE_HIGH /* scl */ |
460 | >; | 461 | >; |
461 | i2c-gpio,sda-open-drain; | 462 | i2c-gpio,sda-open-drain; |
462 | i2c-gpio,scl-open-drain; | 463 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts index b9e300e1f863..8eece2704455 100644 --- a/arch/arm/boot/dts/at91sam9n12ek.dts +++ b/arch/arm/boot/dts/at91sam9n12ek.dts | |||
@@ -55,7 +55,7 @@ | |||
55 | slot@0 { | 55 | slot@0 { |
56 | reg = <0>; | 56 | reg = <0>; |
57 | bus-width = <4>; | 57 | bus-width = <4>; |
58 | cd-gpios = <&pioA 7 0>; | 58 | cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>; |
59 | }; | 59 | }; |
60 | }; | 60 | }; |
61 | 61 | ||
@@ -95,19 +95,19 @@ | |||
95 | 95 | ||
96 | d8 { | 96 | d8 { |
97 | label = "d8"; | 97 | label = "d8"; |
98 | gpios = <&pioB 4 1>; | 98 | gpios = <&pioB 4 GPIO_ACTIVE_LOW>; |
99 | linux,default-trigger = "mmc0"; | 99 | linux,default-trigger = "mmc0"; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | d9 { | 102 | d9 { |
103 | label = "d6"; | 103 | label = "d6"; |
104 | gpios = <&pioB 5 1>; | 104 | gpios = <&pioB 5 GPIO_ACTIVE_LOW>; |
105 | linux,default-trigger = "nand-disk"; | 105 | linux,default-trigger = "nand-disk"; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | d10 { | 108 | d10 { |
109 | label = "d7"; | 109 | label = "d7"; |
110 | gpios = <&pioB 6 0>; | 110 | gpios = <&pioB 6 GPIO_ACTIVE_HIGH>; |
111 | linux,default-trigger = "heartbeat"; | 111 | linux,default-trigger = "heartbeat"; |
112 | }; | 112 | }; |
113 | }; | 113 | }; |
@@ -117,7 +117,7 @@ | |||
117 | 117 | ||
118 | enter { | 118 | enter { |
119 | label = "Enter"; | 119 | label = "Enter"; |
120 | gpios = <&pioB 4 1>; | 120 | gpios = <&pioB 4 GPIO_ACTIVE_LOW>; |
121 | linux,code = <28>; | 121 | linux,code = <28>; |
122 | gpio-key,wakeup; | 122 | gpio-key,wakeup; |
123 | }; | 123 | }; |
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 69b386f8c592..949b8ea2ec0d 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
13 | #include <dt-bindings/gpio/gpio.h> | ||
13 | 14 | ||
14 | / { | 15 | / { |
15 | model = "Atmel AT91SAM9x5 family SoC"; | 16 | model = "Atmel AT91SAM9x5 family SoC"; |
@@ -664,8 +665,8 @@ | |||
664 | atmel,nand-cmd-offset = <22>; | 665 | atmel,nand-cmd-offset = <22>; |
665 | pinctrl-names = "default"; | 666 | pinctrl-names = "default"; |
666 | pinctrl-0 = <&pinctrl_nand>; | 667 | pinctrl-0 = <&pinctrl_nand>; |
667 | gpios = <&pioD 5 0 | 668 | gpios = <&pioD 5 GPIO_ACTIVE_HIGH |
668 | &pioD 4 0 | 669 | &pioD 4 GPIO_ACTIVE_HIGH |
669 | 0 | 670 | 0 |
670 | >; | 671 | >; |
671 | status = "disabled"; | 672 | status = "disabled"; |
@@ -688,8 +689,8 @@ | |||
688 | 689 | ||
689 | i2c@0 { | 690 | i2c@0 { |
690 | compatible = "i2c-gpio"; | 691 | compatible = "i2c-gpio"; |
691 | gpios = <&pioA 30 0 /* sda */ | 692 | gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */ |
692 | &pioA 31 0 /* scl */ | 693 | &pioA 31 GPIO_ACTIVE_HIGH /* scl */ |
693 | >; | 694 | >; |
694 | i2c-gpio,sda-open-drain; | 695 | i2c-gpio,sda-open-drain; |
695 | i2c-gpio,scl-open-drain; | 696 | i2c-gpio,scl-open-drain; |
@@ -703,8 +704,8 @@ | |||
703 | 704 | ||
704 | i2c@1 { | 705 | i2c@1 { |
705 | compatible = "i2c-gpio"; | 706 | compatible = "i2c-gpio"; |
706 | gpios = <&pioC 0 0 /* sda */ | 707 | gpios = <&pioC 0 GPIO_ACTIVE_HIGH /* sda */ |
707 | &pioC 1 0 /* scl */ | 708 | &pioC 1 GPIO_ACTIVE_HIGH /* scl */ |
708 | >; | 709 | >; |
709 | i2c-gpio,sda-open-drain; | 710 | i2c-gpio,sda-open-drain; |
710 | i2c-gpio,scl-open-drain; | 711 | i2c-gpio,scl-open-drain; |
@@ -718,8 +719,8 @@ | |||
718 | 719 | ||
719 | i2c@2 { | 720 | i2c@2 { |
720 | compatible = "i2c-gpio"; | 721 | compatible = "i2c-gpio"; |
721 | gpios = <&pioB 4 0 /* sda */ | 722 | gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */ |
722 | &pioB 5 0 /* scl */ | 723 | &pioB 5 GPIO_ACTIVE_HIGH /* scl */ |
723 | >; | 724 | >; |
724 | i2c-gpio,sda-open-drain; | 725 | i2c-gpio,sda-open-drain; |
725 | i2c-gpio,scl-open-drain; | 726 | i2c-gpio,scl-open-drain; |
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi index 347a74a857f6..94723c30e99b 100644 --- a/arch/arm/boot/dts/at91sam9x5cm.dtsi +++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi | |||
@@ -75,19 +75,19 @@ | |||
75 | 75 | ||
76 | pb18 { | 76 | pb18 { |
77 | label = "pb18"; | 77 | label = "pb18"; |
78 | gpios = <&pioB 18 1>; | 78 | gpios = <&pioB 18 GPIO_ACTIVE_LOW>; |
79 | linux,default-trigger = "heartbeat"; | 79 | linux,default-trigger = "heartbeat"; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | pd21 { | 82 | pd21 { |
83 | label = "pd21"; | 83 | label = "pd21"; |
84 | gpios = <&pioD 21 0>; | 84 | gpios = <&pioD 21 GPIO_ACTIVE_HIGH>; |
85 | }; | 85 | }; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | 1wire_cm { | 88 | 1wire_cm { |
89 | compatible = "w1-gpio"; | 89 | compatible = "w1-gpio"; |
90 | gpios = <&pioB 18 0>; | 90 | gpios = <&pioB 18 GPIO_ACTIVE_HIGH>; |
91 | linux,open-drain; | 91 | linux,open-drain; |
92 | pinctrl-names = "default"; | 92 | pinctrl-names = "default"; |
93 | pinctrl-0 = <&pinctrl_1wire_cm>; | 93 | pinctrl-0 = <&pinctrl_1wire_cm>; |
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi index 24781f29fa61..95f88c7c87f3 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi | |||
@@ -27,7 +27,7 @@ | |||
27 | slot@0 { | 27 | slot@0 { |
28 | reg = <0>; | 28 | reg = <0>; |
29 | bus-width = <4>; | 29 | bus-width = <4>; |
30 | cd-gpios = <&pioD 15 0>; | 30 | cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>; |
31 | }; | 31 | }; |
32 | }; | 32 | }; |
33 | 33 | ||
@@ -40,7 +40,7 @@ | |||
40 | slot@0 { | 40 | slot@0 { |
41 | reg = <0>; | 41 | reg = <0>; |
42 | bus-width = <4>; | 42 | bus-width = <4>; |
43 | cd-gpios = <&pioD 14 0>; | 43 | cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>; |
44 | }; | 44 | }; |
45 | }; | 45 | }; |
46 | 46 | ||
@@ -86,8 +86,8 @@ | |||
86 | usb0: ohci@00600000 { | 86 | usb0: ohci@00600000 { |
87 | status = "okay"; | 87 | status = "okay"; |
88 | num-ports = <2>; | 88 | num-ports = <2>; |
89 | atmel,vbus-gpio = <&pioD 19 1 | 89 | atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW |
90 | &pioD 20 1 | 90 | &pioD 20 GPIO_ACTIVE_LOW |
91 | >; | 91 | >; |
92 | }; | 92 | }; |
93 | 93 | ||
diff --git a/arch/arm/boot/dts/ethernut5.dts b/arch/arm/boot/dts/ethernut5.dts index 2067c6618ba5..143b6d25bc80 100644 --- a/arch/arm/boot/dts/ethernut5.dts +++ b/arch/arm/boot/dts/ethernut5.dts | |||
@@ -40,7 +40,7 @@ | |||
40 | }; | 40 | }; |
41 | 41 | ||
42 | usb1: gadget@fffa4000 { | 42 | usb1: gadget@fffa4000 { |
43 | atmel,vbus-gpio = <&pioC 5 0>; | 43 | atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; |
44 | status = "okay"; | 44 | status = "okay"; |
45 | }; | 45 | }; |
46 | }; | 46 | }; |
@@ -52,7 +52,7 @@ | |||
52 | status = "okay"; | 52 | status = "okay"; |
53 | 53 | ||
54 | gpios = <0 | 54 | gpios = <0 |
55 | &pioC 14 0 | 55 | &pioC 14 GPIO_ACTIVE_HIGH |
56 | 0 | 56 | 0 |
57 | >; | 57 | >; |
58 | 58 | ||
diff --git a/arch/arm/boot/dts/evk-pro3.dts b/arch/arm/boot/dts/evk-pro3.dts index eae2cd7d8d49..4d829685fdfb 100644 --- a/arch/arm/boot/dts/evk-pro3.dts +++ b/arch/arm/boot/dts/evk-pro3.dts | |||
@@ -31,7 +31,7 @@ | |||
31 | }; | 31 | }; |
32 | 32 | ||
33 | usb1: gadget@fffa4000 { | 33 | usb1: gadget@fffa4000 { |
34 | atmel,vbus-gpio = <&pioC 5 0>; | 34 | atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; |
35 | status = "okay"; | 35 | status = "okay"; |
36 | }; | 36 | }; |
37 | 37 | ||
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts index 8328fedcb155..02df1914a47c 100644 --- a/arch/arm/boot/dts/kizbox.dts +++ b/arch/arm/boot/dts/kizbox.dts | |||
@@ -94,26 +94,26 @@ | |||
94 | 94 | ||
95 | led1g { | 95 | led1g { |
96 | label = "led1:green"; | 96 | label = "led1:green"; |
97 | gpios = <&pioB 0 1>; | 97 | gpios = <&pioB 0 GPIO_ACTIVE_LOW>; |
98 | linux,default-trigger = "none"; | 98 | linux,default-trigger = "none"; |
99 | }; | 99 | }; |
100 | 100 | ||
101 | led1r { | 101 | led1r { |
102 | label = "led1:red"; | 102 | label = "led1:red"; |
103 | gpios = <&pioB 1 1>; | 103 | gpios = <&pioB 1 GPIO_ACTIVE_LOW>; |
104 | linux,default-trigger = "none"; | 104 | linux,default-trigger = "none"; |
105 | }; | 105 | }; |
106 | 106 | ||
107 | led2g { | 107 | led2g { |
108 | label = "led2:green"; | 108 | label = "led2:green"; |
109 | gpios = <&pioB 2 1>; | 109 | gpios = <&pioB 2 GPIO_ACTIVE_LOW>; |
110 | linux,default-trigger = "none"; | 110 | linux,default-trigger = "none"; |
111 | default-state = "on"; | 111 | default-state = "on"; |
112 | }; | 112 | }; |
113 | 113 | ||
114 | led2r { | 114 | led2r { |
115 | label = "led2:red"; | 115 | label = "led2:red"; |
116 | gpios = <&pioB 3 1>; | 116 | gpios = <&pioB 3 GPIO_ACTIVE_LOW>; |
117 | linux,default-trigger = "none"; | 117 | linux,default-trigger = "none"; |
118 | }; | 118 | }; |
119 | }; | 119 | }; |
@@ -125,14 +125,14 @@ | |||
125 | 125 | ||
126 | reset { | 126 | reset { |
127 | label = "reset"; | 127 | label = "reset"; |
128 | gpios = <&pioB 30 1>; | 128 | gpios = <&pioB 30 GPIO_ACTIVE_LOW>; |
129 | linux,code = <0x100>; | 129 | linux,code = <0x100>; |
130 | gpio-key,wakeup; | 130 | gpio-key,wakeup; |
131 | }; | 131 | }; |
132 | 132 | ||
133 | mode { | 133 | mode { |
134 | label = "mode"; | 134 | label = "mode"; |
135 | gpios = <&pioB 31 1>; | 135 | gpios = <&pioB 31 GPIO_ACTIVE_LOW>; |
136 | linux,code = <0x101>; | 136 | linux,code = <0x101>; |
137 | gpio-key,wakeup; | 137 | gpio-key,wakeup; |
138 | }; | 138 | }; |
diff --git a/arch/arm/boot/dts/mpa1600.dts b/arch/arm/boot/dts/mpa1600.dts index f1b54a254f91..ccf9ea242f72 100644 --- a/arch/arm/boot/dts/mpa1600.dts +++ b/arch/arm/boot/dts/mpa1600.dts | |||
@@ -62,7 +62,7 @@ | |||
62 | 62 | ||
63 | monitor_mute { | 63 | monitor_mute { |
64 | label = "Monitor mute"; | 64 | label = "Monitor mute"; |
65 | gpios = <&pioC 1 1>; | 65 | gpios = <&pioC 1 GPIO_ACTIVE_LOW>; |
66 | linux,code = <113>; | 66 | linux,code = <113>; |
67 | }; | 67 | }; |
68 | }; | 68 | }; |
diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts index 639410b5de6a..315d9279c9b6 100644 --- a/arch/arm/boot/dts/pm9g45.dts +++ b/arch/arm/boot/dts/pm9g45.dts | |||
@@ -64,7 +64,7 @@ | |||
64 | slot@0 { | 64 | slot@0 { |
65 | reg = <0>; | 65 | reg = <0>; |
66 | bus-width = <4>; | 66 | bus-width = <4>; |
67 | cd-gpios = <&pioD 6 0>; | 67 | cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>; |
68 | }; | 68 | }; |
69 | }; | 69 | }; |
70 | 70 | ||
@@ -81,8 +81,8 @@ | |||
81 | nand-on-flash-bbt; | 81 | nand-on-flash-bbt; |
82 | pinctrl-0 = <&pinctrl_board_nand>; | 82 | pinctrl-0 = <&pinctrl_board_nand>; |
83 | 83 | ||
84 | gpios = <&pioD 3 0 | 84 | gpios = <&pioD 3 GPIO_ACTIVE_HIGH |
85 | &pioC 14 0 | 85 | &pioC 14 GPIO_ACTIVE_HIGH |
86 | 0 | 86 | 0 |
87 | >; | 87 | >; |
88 | 88 | ||
@@ -134,13 +134,13 @@ | |||
134 | 134 | ||
135 | led0 { | 135 | led0 { |
136 | label = "led0"; | 136 | label = "led0"; |
137 | gpios = <&pioD 0 1>; | 137 | gpios = <&pioD 0 GPIO_ACTIVE_LOW>; |
138 | linux,default-trigger = "nand-disk"; | 138 | linux,default-trigger = "nand-disk"; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | led1 { | 141 | led1 { |
142 | label = "led1"; | 142 | label = "led1"; |
143 | gpios = <&pioD 31 0>; | 143 | gpios = <&pioD 31 GPIO_ACTIVE_HIGH>; |
144 | linux,default-trigger = "heartbeat"; | 144 | linux,default-trigger = "heartbeat"; |
145 | }; | 145 | }; |
146 | }; | 146 | }; |
@@ -152,13 +152,13 @@ | |||
152 | 152 | ||
153 | right { | 153 | right { |
154 | label = "SW4"; | 154 | label = "SW4"; |
155 | gpios = <&pioE 7 1>; | 155 | gpios = <&pioE 7 GPIO_ACTIVE_LOW>; |
156 | linux,code = <106>; | 156 | linux,code = <106>; |
157 | }; | 157 | }; |
158 | 158 | ||
159 | up { | 159 | up { |
160 | label = "SW3"; | 160 | label = "SW3"; |
161 | gpios = <&pioE 8 1>; | 161 | gpios = <&pioE 8 GPIO_ACTIVE_LOW>; |
162 | linux,code = <103>; | 162 | linux,code = <103>; |
163 | }; | 163 | }; |
164 | }; | 164 | }; |
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 2293fa1b1950..0d65e3d375a3 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | #include <dt-bindings/gpio/gpio.h> | ||
12 | 13 | ||
13 | / { | 14 | / { |
14 | model = "Atmel SAMA5D3 family SoC"; | 15 | model = "Atmel SAMA5D3 family SoC"; |
diff --git a/arch/arm/boot/dts/sama5d31ek.dts b/arch/arm/boot/dts/sama5d31ek.dts index 5bffd66ecb7a..027bac7510b6 100644 --- a/arch/arm/boot/dts/sama5d31ek.dts +++ b/arch/arm/boot/dts/sama5d31ek.dts | |||
@@ -41,7 +41,7 @@ | |||
41 | leds { | 41 | leds { |
42 | d3 { | 42 | d3 { |
43 | label = "d3"; | 43 | label = "d3"; |
44 | gpios = <&pioE 24 0>; | 44 | gpios = <&pioE 24 GPIO_ACTIVE_HIGH>; |
45 | }; | 45 | }; |
46 | }; | 46 | }; |
47 | 47 | ||
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts index d88ff72a91bc..fb8ee11cf282 100644 --- a/arch/arm/boot/dts/sama5d34ek.dts +++ b/arch/arm/boot/dts/sama5d34ek.dts | |||
@@ -51,7 +51,7 @@ | |||
51 | leds { | 51 | leds { |
52 | d3 { | 52 | d3 { |
53 | label = "d3"; | 53 | label = "d3"; |
54 | gpios = <&pioE 24 0>; | 54 | gpios = <&pioE 24 GPIO_ACTIVE_HIGH>; |
55 | }; | 55 | }; |
56 | }; | 56 | }; |
57 | 57 | ||
diff --git a/arch/arm/boot/dts/sama5d35ek.dts b/arch/arm/boot/dts/sama5d35ek.dts index 3c364d233b13..509a53d9cc7b 100644 --- a/arch/arm/boot/dts/sama5d35ek.dts +++ b/arch/arm/boot/dts/sama5d35ek.dts | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | pb_user1 { | 49 | pb_user1 { |
50 | label = "pb_user1"; | 50 | label = "pb_user1"; |
51 | gpios = <&pioE 27 0>; | 51 | gpios = <&pioE 27 GPIO_ACTIVE_HIGH>; |
52 | linux,code = <0x100>; | 52 | linux,code = <0x100>; |
53 | gpio-key,wakeup; | 53 | gpio-key,wakeup; |
54 | }; | 54 | }; |
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi index b552917cf84e..60637e4e9bbf 100644 --- a/arch/arm/boot/dts/sama5d3xcm.dtsi +++ b/arch/arm/boot/dts/sama5d3xcm.dtsi | |||
@@ -85,7 +85,7 @@ | |||
85 | 85 | ||
86 | d2 { | 86 | d2 { |
87 | label = "d2"; | 87 | label = "d2"; |
88 | gpios = <&pioE 25 1>; /* PE25, conflicts with A25, RXD2 */ | 88 | gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */ |
89 | }; | 89 | }; |
90 | }; | 90 | }; |
91 | }; | 91 | }; |
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index a5e7131e22fc..205e64c5ddee 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi | |||
@@ -20,7 +20,7 @@ | |||
20 | slot@0 { | 20 | slot@0 { |
21 | reg = <0>; | 21 | reg = <0>; |
22 | bus-width = <4>; | 22 | bus-width = <4>; |
23 | cd-gpios = <&pioD 17 0>; | 23 | cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>; |
24 | }; | 24 | }; |
25 | }; | 25 | }; |
26 | 26 | ||
@@ -62,7 +62,7 @@ | |||
62 | slot@0 { | 62 | slot@0 { |
63 | reg = <0>; | 63 | reg = <0>; |
64 | bus-width = <4>; | 64 | bus-width = <4>; |
65 | cd-gpios = <&pioD 18 0>; | 65 | cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>; |
66 | }; | 66 | }; |
67 | }; | 67 | }; |
68 | 68 | ||
@@ -127,7 +127,7 @@ | |||
127 | }; | 127 | }; |
128 | 128 | ||
129 | usb0: gadget@00500000 { | 129 | usb0: gadget@00500000 { |
130 | atmel,vbus-gpio = <&pioD 29 0>; | 130 | atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>; |
131 | pinctrl-names = "default"; | 131 | pinctrl-names = "default"; |
132 | pinctrl-0 = <&pinctrl_usba_vbus>; | 132 | pinctrl-0 = <&pinctrl_usba_vbus>; |
133 | status = "okay"; | 133 | status = "okay"; |
@@ -135,9 +135,9 @@ | |||
135 | 135 | ||
136 | usb1: ohci@00600000 { | 136 | usb1: ohci@00600000 { |
137 | num-ports = <3>; | 137 | num-ports = <3>; |
138 | atmel,vbus-gpio = <&pioD 25 0 | 138 | atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH |
139 | &pioD 26 1 | 139 | &pioD 26 GPIO_ACTIVE_LOW |
140 | &pioD 27 1 | 140 | &pioD 27 GPIO_ACTIVE_LOW |
141 | >; | 141 | >; |
142 | status = "okay"; | 142 | status = "okay"; |
143 | }; | 143 | }; |
diff --git a/arch/arm/boot/dts/tny_a9263.dts b/arch/arm/boot/dts/tny_a9263.dts index 45f059ba5691..0751a6a979a8 100644 --- a/arch/arm/boot/dts/tny_a9263.dts +++ b/arch/arm/boot/dts/tny_a9263.dts | |||
@@ -38,7 +38,7 @@ | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | usb1: gadget@fff78000 { | 40 | usb1: gadget@fff78000 { |
41 | atmel,vbus-gpio = <&pioB 11 0>; | 41 | atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; |
42 | status = "okay"; | 42 | status = "okay"; |
43 | }; | 43 | }; |
44 | }; | 44 | }; |
diff --git a/arch/arm/boot/dts/usb_a9260_common.dtsi b/arch/arm/boot/dts/usb_a9260_common.dtsi index e70d229baef5..285977682cf3 100644 --- a/arch/arm/boot/dts/usb_a9260_common.dtsi +++ b/arch/arm/boot/dts/usb_a9260_common.dtsi | |||
@@ -30,7 +30,7 @@ | |||
30 | }; | 30 | }; |
31 | 31 | ||
32 | usb1: gadget@fffa4000 { | 32 | usb1: gadget@fffa4000 { |
33 | atmel,vbus-gpio = <&pioC 5 0>; | 33 | atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; |
34 | status = "okay"; | 34 | status = "okay"; |
35 | }; | 35 | }; |
36 | }; | 36 | }; |
@@ -93,7 +93,7 @@ | |||
93 | 93 | ||
94 | user_led { | 94 | user_led { |
95 | label = "user_led"; | 95 | label = "user_led"; |
96 | gpios = <&pioB 21 1>; | 96 | gpios = <&pioB 21 GPIO_ACTIVE_LOW>; |
97 | linux,default-trigger = "heartbeat"; | 97 | linux,default-trigger = "heartbeat"; |
98 | }; | 98 | }; |
99 | }; | 99 | }; |
@@ -105,7 +105,7 @@ | |||
105 | 105 | ||
106 | user_pb { | 106 | user_pb { |
107 | label = "user_pb"; | 107 | label = "user_pb"; |
108 | gpios = <&pioB 10 1>; | 108 | gpios = <&pioB 10 GPIO_ACTIVE_LOW>; |
109 | linux,code = <28>; | 109 | linux,code = <28>; |
110 | gpio-key,wakeup; | 110 | gpio-key,wakeup; |
111 | }; | 111 | }; |
diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts index 82e204aae6b9..f8ec36cb036b 100644 --- a/arch/arm/boot/dts/usb_a9263.dts +++ b/arch/arm/boot/dts/usb_a9263.dts | |||
@@ -43,7 +43,7 @@ | |||
43 | }; | 43 | }; |
44 | 44 | ||
45 | usb1: gadget@fff78000 { | 45 | usb1: gadget@fff78000 { |
46 | atmel,vbus-gpio = <&pioB 11 0>; | 46 | atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; |
47 | status = "okay"; | 47 | status = "okay"; |
48 | }; | 48 | }; |
49 | 49 | ||
@@ -107,7 +107,7 @@ | |||
107 | 107 | ||
108 | user_led { | 108 | user_led { |
109 | label = "user_led"; | 109 | label = "user_led"; |
110 | gpios = <&pioB 21 0>; | 110 | gpios = <&pioB 21 GPIO_ACTIVE_HIGH>; |
111 | linux,default-trigger = "heartbeat"; | 111 | linux,default-trigger = "heartbeat"; |
112 | }; | 112 | }; |
113 | }; | 113 | }; |
@@ -119,7 +119,7 @@ | |||
119 | 119 | ||
120 | user_pb { | 120 | user_pb { |
121 | label = "user_pb"; | 121 | label = "user_pb"; |
122 | gpios = <&pioB 10 1>; | 122 | gpios = <&pioB 10 GPIO_ACTIVE_LOW>; |
123 | linux,code = <28>; | 123 | linux,code = <28>; |
124 | gpio-key,wakeup; | 124 | gpio-key,wakeup; |
125 | }; | 125 | }; |
diff --git a/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi b/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi index ad3eca17c436..5b0ffc1a0b24 100644 --- a/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi +++ b/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi | |||
@@ -28,39 +28,39 @@ | |||
28 | 28 | ||
29 | user_led1 { | 29 | user_led1 { |
30 | label = "user_led1"; | 30 | label = "user_led1"; |
31 | gpios = <&pioB 20 1>; | 31 | gpios = <&pioB 20 GPIO_ACTIVE_LOW>; |
32 | }; | 32 | }; |
33 | 33 | ||
34 | /* | 34 | /* |
35 | * led already used by mother board but active as high | 35 | * led already used by mother board but active as high |
36 | * user_led2 { | 36 | * user_led2 { |
37 | * label = "user_led2"; | 37 | * label = "user_led2"; |
38 | * gpios = <&pioB 21 1>; | 38 | * gpios = <&pioB 21 GPIO_ACTIVE_LOW>; |
39 | * }; | 39 | * }; |
40 | */ | 40 | */ |
41 | user_led3 { | 41 | user_led3 { |
42 | label = "user_led3"; | 42 | label = "user_led3"; |
43 | gpios = <&pioB 22 1>; | 43 | gpios = <&pioB 22 GPIO_ACTIVE_LOW>; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | user_led4 { | 46 | user_led4 { |
47 | label = "user_led4"; | 47 | label = "user_led4"; |
48 | gpios = <&pioB 23 1>; | 48 | gpios = <&pioB 23 GPIO_ACTIVE_LOW>; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | red { | 51 | red { |
52 | label = "red"; | 52 | label = "red"; |
53 | gpios = <&pioB 24 1>; | 53 | gpios = <&pioB 24 GPIO_ACTIVE_LOW>; |
54 | }; | 54 | }; |
55 | 55 | ||
56 | orange { | 56 | orange { |
57 | label = "orange"; | 57 | label = "orange"; |
58 | gpios = <&pioB 30 1>; | 58 | gpios = <&pioB 30 GPIO_ACTIVE_LOW>; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | green { | 61 | green { |
62 | label = "green"; | 62 | label = "green"; |
63 | gpios = <&pioB 31 1>; | 63 | gpios = <&pioB 31 GPIO_ACTIVE_LOW>; |
64 | }; | 64 | }; |
65 | }; | 65 | }; |
66 | 66 | ||
@@ -71,25 +71,25 @@ | |||
71 | 71 | ||
72 | user_pb1 { | 72 | user_pb1 { |
73 | label = "user_pb1"; | 73 | label = "user_pb1"; |
74 | gpios = <&pioB 25 1>; | 74 | gpios = <&pioB 25 GPIO_ACTIVE_LOW>; |
75 | linux,code = <0x100>; | 75 | linux,code = <0x100>; |
76 | }; | 76 | }; |
77 | 77 | ||
78 | user_pb2 { | 78 | user_pb2 { |
79 | label = "user_pb2"; | 79 | label = "user_pb2"; |
80 | gpios = <&pioB 13 1>; | 80 | gpios = <&pioB 13 GPIO_ACTIVE_LOW>; |
81 | linux,code = <0x101>; | 81 | linux,code = <0x101>; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | user_pb3 { | 84 | user_pb3 { |
85 | label = "user_pb3"; | 85 | label = "user_pb3"; |
86 | gpios = <&pioA 26 1>; | 86 | gpios = <&pioA 26 GPIO_ACTIVE_LOW>; |
87 | linux,code = <0x102>; | 87 | linux,code = <0x102>; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | user_pb4 { | 90 | user_pb4 { |
91 | label = "user_pb4"; | 91 | label = "user_pb4"; |
92 | gpios = <&pioC 9 1>; | 92 | gpios = <&pioC 9 GPIO_ACTIVE_LOW>; |
93 | linux,code = <0x103>; | 93 | linux,code = <0x103>; |
94 | }; | 94 | }; |
95 | }; | 95 | }; |