diff options
author | Jon Hunter <jon-hunter@ti.com> | 2013-03-07 16:44:39 -0500 |
---|---|---|
committer | Benoit Cousson <benoit.cousson@linaro.org> | 2013-04-08 18:21:08 -0400 |
commit | ff5c9059c9ba65b8bd91fd3cffac863f91f3b425 (patch) | |
tree | 01f960283e5f9376a881fab49ac36a126343623e | |
parent | 423182e3b017f8a44f5ec33da25eb370b2ab7b9a (diff) |
ARM: dts: OMAP3+: Correct gpio #interrupts-cells property
The OMAP gpio binding documention [1] states that the #interrupts-cells
property for gpio controllers should be 2. Currently, for OMAP3+ devices
the #interrupt-cells is set to 1. By setting this property to 2, it
allows clients to pass a 2nd parameter indicating the sensitivity (level
or edge) and polarity (high or low) of the interrupt. The OMAP gpio
controllers support these options and so update the #interrupt-cells
property for OMAP3+ devices to 2.
[1] Documentation/devicetree/bindings/gpio/gpio-omap.txt
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 12 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 16 |
3 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index ab9cc6b836b1..e2a02a743206 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -117,7 +117,7 @@ | |||
117 | gpio-controller; | 117 | gpio-controller; |
118 | #gpio-cells = <2>; | 118 | #gpio-cells = <2>; |
119 | interrupt-controller; | 119 | interrupt-controller; |
120 | #interrupt-cells = <1>; | 120 | #interrupt-cells = <2>; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | gpio2: gpio@49050000 { | 123 | gpio2: gpio@49050000 { |
@@ -126,7 +126,7 @@ | |||
126 | gpio-controller; | 126 | gpio-controller; |
127 | #gpio-cells = <2>; | 127 | #gpio-cells = <2>; |
128 | interrupt-controller; | 128 | interrupt-controller; |
129 | #interrupt-cells = <1>; | 129 | #interrupt-cells = <2>; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | gpio3: gpio@49052000 { | 132 | gpio3: gpio@49052000 { |
@@ -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 | gpio4: gpio@49054000 { | 141 | gpio4: gpio@49054000 { |
@@ -144,7 +144,7 @@ | |||
144 | gpio-controller; | 144 | gpio-controller; |
145 | #gpio-cells = <2>; | 145 | #gpio-cells = <2>; |
146 | interrupt-controller; | 146 | interrupt-controller; |
147 | #interrupt-cells = <1>; | 147 | #interrupt-cells = <2>; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | gpio5: gpio@49056000 { | 150 | gpio5: gpio@49056000 { |
@@ -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 | gpio6: gpio@49058000 { | 159 | gpio6: gpio@49058000 { |
@@ -162,7 +162,7 @@ | |||
162 | gpio-controller; | 162 | gpio-controller; |
163 | #gpio-cells = <2>; | 163 | #gpio-cells = <2>; |
164 | interrupt-controller; | 164 | interrupt-controller; |
165 | #interrupt-cells = <1>; | 165 | #interrupt-cells = <2>; |
166 | }; | 166 | }; |
167 | 167 | ||
168 | uart1: serial@4806a000 { | 168 | uart1: serial@4806a000 { |
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index 2b0da055ef11..b55f9fa4a697 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi | |||
@@ -138,7 +138,7 @@ | |||
138 | gpio-controller; | 138 | gpio-controller; |
139 | #gpio-cells = <2>; | 139 | #gpio-cells = <2>; |
140 | interrupt-controller; | 140 | interrupt-controller; |
141 | #interrupt-cells = <1>; | 141 | #interrupt-cells = <2>; |
142 | }; | 142 | }; |
143 | 143 | ||
144 | gpio2: gpio@48055000 { | 144 | gpio2: gpio@48055000 { |
@@ -149,7 +149,7 @@ | |||
149 | gpio-controller; | 149 | gpio-controller; |
150 | #gpio-cells = <2>; | 150 | #gpio-cells = <2>; |
151 | interrupt-controller; | 151 | interrupt-controller; |
152 | #interrupt-cells = <1>; | 152 | #interrupt-cells = <2>; |
153 | }; | 153 | }; |
154 | 154 | ||
155 | gpio3: gpio@48057000 { | 155 | gpio3: gpio@48057000 { |
@@ -160,7 +160,7 @@ | |||
160 | gpio-controller; | 160 | gpio-controller; |
161 | #gpio-cells = <2>; | 161 | #gpio-cells = <2>; |
162 | interrupt-controller; | 162 | interrupt-controller; |
163 | #interrupt-cells = <1>; | 163 | #interrupt-cells = <2>; |
164 | }; | 164 | }; |
165 | 165 | ||
166 | gpio4: gpio@48059000 { | 166 | gpio4: gpio@48059000 { |
@@ -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 | gpio5: gpio@4805b000 { | 177 | gpio5: gpio@4805b000 { |
@@ -182,7 +182,7 @@ | |||
182 | gpio-controller; | 182 | gpio-controller; |
183 | #gpio-cells = <2>; | 183 | #gpio-cells = <2>; |
184 | interrupt-controller; | 184 | interrupt-controller; |
185 | #interrupt-cells = <1>; | 185 | #interrupt-cells = <2>; |
186 | }; | 186 | }; |
187 | 187 | ||
188 | gpio6: gpio@4805d000 { | 188 | gpio6: gpio@4805d000 { |
@@ -193,7 +193,7 @@ | |||
193 | gpio-controller; | 193 | gpio-controller; |
194 | #gpio-cells = <2>; | 194 | #gpio-cells = <2>; |
195 | interrupt-controller; | 195 | interrupt-controller; |
196 | #interrupt-cells = <1>; | 196 | #interrupt-cells = <2>; |
197 | }; | 197 | }; |
198 | 198 | ||
199 | gpmc: gpmc@50000000 { | 199 | gpmc: gpmc@50000000 { |
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 61cbd1c6e075..b4d2eb99815f 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi | |||
@@ -128,7 +128,7 @@ | |||
128 | gpio-controller; | 128 | gpio-controller; |
129 | #gpio-cells = <2>; | 129 | #gpio-cells = <2>; |
130 | interrupt-controller; | 130 | interrupt-controller; |
131 | #interrupt-cells = <1>; | 131 | #interrupt-cells = <2>; |
132 | }; | 132 | }; |
133 | 133 | ||
134 | gpio2: gpio@48055000 { | 134 | gpio2: gpio@48055000 { |
@@ -139,7 +139,7 @@ | |||
139 | gpio-controller; | 139 | gpio-controller; |
140 | #gpio-cells = <2>; | 140 | #gpio-cells = <2>; |
141 | interrupt-controller; | 141 | interrupt-controller; |
142 | #interrupt-cells = <1>; | 142 | #interrupt-cells = <2>; |
143 | }; | 143 | }; |
144 | 144 | ||
145 | gpio3: gpio@48057000 { | 145 | gpio3: gpio@48057000 { |
@@ -150,7 +150,7 @@ | |||
150 | gpio-controller; | 150 | gpio-controller; |
151 | #gpio-cells = <2>; | 151 | #gpio-cells = <2>; |
152 | interrupt-controller; | 152 | interrupt-controller; |
153 | #interrupt-cells = <1>; | 153 | #interrupt-cells = <2>; |
154 | }; | 154 | }; |
155 | 155 | ||
156 | gpio4: gpio@48059000 { | 156 | gpio4: gpio@48059000 { |
@@ -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 | gpio5: gpio@4805b000 { | 167 | gpio5: gpio@4805b000 { |
@@ -172,7 +172,7 @@ | |||
172 | gpio-controller; | 172 | gpio-controller; |
173 | #gpio-cells = <2>; | 173 | #gpio-cells = <2>; |
174 | interrupt-controller; | 174 | interrupt-controller; |
175 | #interrupt-cells = <1>; | 175 | #interrupt-cells = <2>; |
176 | }; | 176 | }; |
177 | 177 | ||
178 | gpio6: gpio@4805d000 { | 178 | gpio6: gpio@4805d000 { |
@@ -183,7 +183,7 @@ | |||
183 | gpio-controller; | 183 | gpio-controller; |
184 | #gpio-cells = <2>; | 184 | #gpio-cells = <2>; |
185 | interrupt-controller; | 185 | interrupt-controller; |
186 | #interrupt-cells = <1>; | 186 | #interrupt-cells = <2>; |
187 | }; | 187 | }; |
188 | 188 | ||
189 | gpio7: gpio@48051000 { | 189 | gpio7: gpio@48051000 { |
@@ -194,7 +194,7 @@ | |||
194 | gpio-controller; | 194 | gpio-controller; |
195 | #gpio-cells = <2>; | 195 | #gpio-cells = <2>; |
196 | interrupt-controller; | 196 | interrupt-controller; |
197 | #interrupt-cells = <1>; | 197 | #interrupt-cells = <2>; |
198 | }; | 198 | }; |
199 | 199 | ||
200 | gpio8: gpio@48053000 { | 200 | gpio8: gpio@48053000 { |
@@ -205,7 +205,7 @@ | |||
205 | gpio-controller; | 205 | gpio-controller; |
206 | #gpio-cells = <2>; | 206 | #gpio-cells = <2>; |
207 | interrupt-controller; | 207 | interrupt-controller; |
208 | #interrupt-cells = <1>; | 208 | #interrupt-cells = <2>; |
209 | }; | 209 | }; |
210 | 210 | ||
211 | gpmc: gpmc@50000000 { | 211 | gpmc: gpmc@50000000 { |