diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-07-06 08:03:37 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-07-07 08:13:24 -0400 |
commit | 88cde8b78f6914ce542949e5a8dd9031e3035996 (patch) | |
tree | 05ce753b31d68d2f2c8cc61006ff68a5365eb53e /arch/arm | |
parent | c1cb438522f2cd62fb3a261d66a549606c131c93 (diff) |
ARM: dts: imx: update #interrupt-cells for gpio nodes
Change the value of #interrupt-cells of gpio nodes from 1 to 2, so that
the gpio irq type can be specified in device tree. Also update binding
document to make it clear.
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 14 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 14 |
4 files changed, 24 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 386c769c38d1..00bae3aad5ab 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
@@ -121,7 +121,7 @@ | |||
121 | gpio-controller; | 121 | gpio-controller; |
122 | #gpio-cells = <2>; | 122 | #gpio-cells = <2>; |
123 | interrupt-controller; | 123 | interrupt-controller; |
124 | #interrupt-cells = <1>; | 124 | #interrupt-cells = <2>; |
125 | }; | 125 | }; |
126 | 126 | ||
127 | gpio2: gpio@10015100 { | 127 | gpio2: gpio@10015100 { |
@@ -131,7 +131,7 @@ | |||
131 | gpio-controller; | 131 | gpio-controller; |
132 | #gpio-cells = <2>; | 132 | #gpio-cells = <2>; |
133 | interrupt-controller; | 133 | interrupt-controller; |
134 | #interrupt-cells = <1>; | 134 | #interrupt-cells = <2>; |
135 | }; | 135 | }; |
136 | 136 | ||
137 | gpio3: gpio@10015200 { | 137 | gpio3: gpio@10015200 { |
@@ -141,7 +141,7 @@ | |||
141 | gpio-controller; | 141 | gpio-controller; |
142 | #gpio-cells = <2>; | 142 | #gpio-cells = <2>; |
143 | interrupt-controller; | 143 | interrupt-controller; |
144 | #interrupt-cells = <1>; | 144 | #interrupt-cells = <2>; |
145 | }; | 145 | }; |
146 | 146 | ||
147 | gpio4: gpio@10015300 { | 147 | gpio4: gpio@10015300 { |
@@ -151,7 +151,7 @@ | |||
151 | gpio-controller; | 151 | gpio-controller; |
152 | #gpio-cells = <2>; | 152 | #gpio-cells = <2>; |
153 | interrupt-controller; | 153 | interrupt-controller; |
154 | #interrupt-cells = <1>; | 154 | #interrupt-cells = <2>; |
155 | }; | 155 | }; |
156 | 156 | ||
157 | gpio5: gpio@10015400 { | 157 | gpio5: gpio@10015400 { |
@@ -161,7 +161,7 @@ | |||
161 | gpio-controller; | 161 | gpio-controller; |
162 | #gpio-cells = <2>; | 162 | #gpio-cells = <2>; |
163 | interrupt-controller; | 163 | interrupt-controller; |
164 | #interrupt-cells = <1>; | 164 | #interrupt-cells = <2>; |
165 | }; | 165 | }; |
166 | 166 | ||
167 | gpio6: gpio@10015500 { | 167 | gpio6: gpio@10015500 { |
@@ -171,7 +171,7 @@ | |||
171 | gpio-controller; | 171 | gpio-controller; |
172 | #gpio-cells = <2>; | 172 | #gpio-cells = <2>; |
173 | interrupt-controller; | 173 | interrupt-controller; |
174 | #interrupt-cells = <1>; | 174 | #interrupt-cells = <2>; |
175 | }; | 175 | }; |
176 | 176 | ||
177 | cspi3: cspi@10017000 { | 177 | cspi3: cspi@10017000 { |
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index bfa65abe8ef2..922adefdd291 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
@@ -133,7 +133,7 @@ | |||
133 | gpio-controller; | 133 | gpio-controller; |
134 | #gpio-cells = <2>; | 134 | #gpio-cells = <2>; |
135 | interrupt-controller; | 135 | interrupt-controller; |
136 | #interrupt-cells = <1>; | 136 | #interrupt-cells = <2>; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | gpio2: gpio@73f88000 { | 139 | gpio2: gpio@73f88000 { |
@@ -143,7 +143,7 @@ | |||
143 | gpio-controller; | 143 | gpio-controller; |
144 | #gpio-cells = <2>; | 144 | #gpio-cells = <2>; |
145 | interrupt-controller; | 145 | interrupt-controller; |
146 | #interrupt-cells = <1>; | 146 | #interrupt-cells = <2>; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | gpio3: gpio@73f8c000 { | 149 | gpio3: gpio@73f8c000 { |
@@ -153,7 +153,7 @@ | |||
153 | gpio-controller; | 153 | gpio-controller; |
154 | #gpio-cells = <2>; | 154 | #gpio-cells = <2>; |
155 | interrupt-controller; | 155 | interrupt-controller; |
156 | #interrupt-cells = <1>; | 156 | #interrupt-cells = <2>; |
157 | }; | 157 | }; |
158 | 158 | ||
159 | gpio4: gpio@73f90000 { | 159 | gpio4: gpio@73f90000 { |
@@ -163,7 +163,7 @@ | |||
163 | gpio-controller; | 163 | gpio-controller; |
164 | #gpio-cells = <2>; | 164 | #gpio-cells = <2>; |
165 | interrupt-controller; | 165 | interrupt-controller; |
166 | #interrupt-cells = <1>; | 166 | #interrupt-cells = <2>; |
167 | }; | 167 | }; |
168 | 168 | ||
169 | wdog@73f98000 { /* WDOG1 */ | 169 | wdog@73f98000 { /* WDOG1 */ |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index e3e869470cd3..4e735edc78ed 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
@@ -135,7 +135,7 @@ | |||
135 | gpio-controller; | 135 | gpio-controller; |
136 | #gpio-cells = <2>; | 136 | #gpio-cells = <2>; |
137 | interrupt-controller; | 137 | interrupt-controller; |
138 | #interrupt-cells = <1>; | 138 | #interrupt-cells = <2>; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | gpio2: gpio@53f88000 { | 141 | gpio2: gpio@53f88000 { |
@@ -145,7 +145,7 @@ | |||
145 | gpio-controller; | 145 | gpio-controller; |
146 | #gpio-cells = <2>; | 146 | #gpio-cells = <2>; |
147 | interrupt-controller; | 147 | interrupt-controller; |
148 | #interrupt-cells = <1>; | 148 | #interrupt-cells = <2>; |
149 | }; | 149 | }; |
150 | 150 | ||
151 | gpio3: gpio@53f8c000 { | 151 | gpio3: gpio@53f8c000 { |
@@ -155,7 +155,7 @@ | |||
155 | gpio-controller; | 155 | gpio-controller; |
156 | #gpio-cells = <2>; | 156 | #gpio-cells = <2>; |
157 | interrupt-controller; | 157 | interrupt-controller; |
158 | #interrupt-cells = <1>; | 158 | #interrupt-cells = <2>; |
159 | }; | 159 | }; |
160 | 160 | ||
161 | gpio4: gpio@53f90000 { | 161 | gpio4: gpio@53f90000 { |
@@ -165,7 +165,7 @@ | |||
165 | gpio-controller; | 165 | gpio-controller; |
166 | #gpio-cells = <2>; | 166 | #gpio-cells = <2>; |
167 | interrupt-controller; | 167 | interrupt-controller; |
168 | #interrupt-cells = <1>; | 168 | #interrupt-cells = <2>; |
169 | }; | 169 | }; |
170 | 170 | ||
171 | wdog@53f98000 { /* WDOG1 */ | 171 | wdog@53f98000 { /* WDOG1 */ |
@@ -203,7 +203,7 @@ | |||
203 | gpio-controller; | 203 | gpio-controller; |
204 | #gpio-cells = <2>; | 204 | #gpio-cells = <2>; |
205 | interrupt-controller; | 205 | interrupt-controller; |
206 | #interrupt-cells = <1>; | 206 | #interrupt-cells = <2>; |
207 | }; | 207 | }; |
208 | 208 | ||
209 | gpio6: gpio@53fe0000 { | 209 | gpio6: gpio@53fe0000 { |
@@ -213,7 +213,7 @@ | |||
213 | gpio-controller; | 213 | gpio-controller; |
214 | #gpio-cells = <2>; | 214 | #gpio-cells = <2>; |
215 | interrupt-controller; | 215 | interrupt-controller; |
216 | #interrupt-cells = <1>; | 216 | #interrupt-cells = <2>; |
217 | }; | 217 | }; |
218 | 218 | ||
219 | gpio7: gpio@53fe4000 { | 219 | gpio7: gpio@53fe4000 { |
@@ -223,7 +223,7 @@ | |||
223 | gpio-controller; | 223 | gpio-controller; |
224 | #gpio-cells = <2>; | 224 | #gpio-cells = <2>; |
225 | interrupt-controller; | 225 | interrupt-controller; |
226 | #interrupt-cells = <1>; | 226 | #interrupt-cells = <2>; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | i2c@53fec000 { /* I2C3 */ | 229 | i2c@53fec000 { /* I2C3 */ |
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 16a3884ac9d7..bf88fb77526a 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi | |||
@@ -283,7 +283,7 @@ | |||
283 | gpio-controller; | 283 | gpio-controller; |
284 | #gpio-cells = <2>; | 284 | #gpio-cells = <2>; |
285 | interrupt-controller; | 285 | interrupt-controller; |
286 | #interrupt-cells = <1>; | 286 | #interrupt-cells = <2>; |
287 | }; | 287 | }; |
288 | 288 | ||
289 | gpio2: gpio@020a0000 { | 289 | gpio2: gpio@020a0000 { |
@@ -293,7 +293,7 @@ | |||
293 | gpio-controller; | 293 | gpio-controller; |
294 | #gpio-cells = <2>; | 294 | #gpio-cells = <2>; |
295 | interrupt-controller; | 295 | interrupt-controller; |
296 | #interrupt-cells = <1>; | 296 | #interrupt-cells = <2>; |
297 | }; | 297 | }; |
298 | 298 | ||
299 | gpio3: gpio@020a4000 { | 299 | gpio3: gpio@020a4000 { |
@@ -303,7 +303,7 @@ | |||
303 | gpio-controller; | 303 | gpio-controller; |
304 | #gpio-cells = <2>; | 304 | #gpio-cells = <2>; |
305 | interrupt-controller; | 305 | interrupt-controller; |
306 | #interrupt-cells = <1>; | 306 | #interrupt-cells = <2>; |
307 | }; | 307 | }; |
308 | 308 | ||
309 | gpio4: gpio@020a8000 { | 309 | gpio4: gpio@020a8000 { |
@@ -313,7 +313,7 @@ | |||
313 | gpio-controller; | 313 | gpio-controller; |
314 | #gpio-cells = <2>; | 314 | #gpio-cells = <2>; |
315 | interrupt-controller; | 315 | interrupt-controller; |
316 | #interrupt-cells = <1>; | 316 | #interrupt-cells = <2>; |
317 | }; | 317 | }; |
318 | 318 | ||
319 | gpio5: gpio@020ac000 { | 319 | gpio5: gpio@020ac000 { |
@@ -323,7 +323,7 @@ | |||
323 | gpio-controller; | 323 | gpio-controller; |
324 | #gpio-cells = <2>; | 324 | #gpio-cells = <2>; |
325 | interrupt-controller; | 325 | interrupt-controller; |
326 | #interrupt-cells = <1>; | 326 | #interrupt-cells = <2>; |
327 | }; | 327 | }; |
328 | 328 | ||
329 | gpio6: gpio@020b0000 { | 329 | gpio6: gpio@020b0000 { |
@@ -333,7 +333,7 @@ | |||
333 | gpio-controller; | 333 | gpio-controller; |
334 | #gpio-cells = <2>; | 334 | #gpio-cells = <2>; |
335 | interrupt-controller; | 335 | interrupt-controller; |
336 | #interrupt-cells = <1>; | 336 | #interrupt-cells = <2>; |
337 | }; | 337 | }; |
338 | 338 | ||
339 | gpio7: gpio@020b4000 { | 339 | gpio7: gpio@020b4000 { |
@@ -343,7 +343,7 @@ | |||
343 | gpio-controller; | 343 | gpio-controller; |
344 | #gpio-cells = <2>; | 344 | #gpio-cells = <2>; |
345 | interrupt-controller; | 345 | interrupt-controller; |
346 | #interrupt-cells = <1>; | 346 | #interrupt-cells = <2>; |
347 | }; | 347 | }; |
348 | 348 | ||
349 | kpp@020b8000 { | 349 | kpp@020b8000 { |