diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:06:12 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:10:36 -0400 |
commit | 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24 (patch) | |
tree | eeeb8cc3bf7be5ec0e54b7c4f3808ef88ecca012 /arch/arm/boot | |
parent | 9756fe38d10b2bf90c81dc4d2f17d5632e135364 (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) |
Merge tag 'v3.5-rc4' into drm-intel-next-queued
I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(
Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).
Conflicts:
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ringbuffer.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'arch/arm/boot')
23 files changed, 297 insertions, 74 deletions
diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 881bc3987844..4ad5160018cb 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi | |||
@@ -58,6 +58,8 @@ | |||
58 | "st,nomadik-gpio"; | 58 | "st,nomadik-gpio"; |
59 | reg = <0x8012e000 0x80>; | 59 | reg = <0x8012e000 0x80>; |
60 | interrupts = <0 119 0x4>; | 60 | interrupts = <0 119 0x4>; |
61 | interrupt-controller; | ||
62 | #interrupt-cells = <2>; | ||
61 | supports-sleepmode; | 63 | supports-sleepmode; |
62 | gpio-controller; | 64 | gpio-controller; |
63 | #gpio-cells = <2>; | 65 | #gpio-cells = <2>; |
@@ -69,6 +71,8 @@ | |||
69 | "st,nomadik-gpio"; | 71 | "st,nomadik-gpio"; |
70 | reg = <0x8012e080 0x80>; | 72 | reg = <0x8012e080 0x80>; |
71 | interrupts = <0 120 0x4>; | 73 | interrupts = <0 120 0x4>; |
74 | interrupt-controller; | ||
75 | #interrupt-cells = <2>; | ||
72 | supports-sleepmode; | 76 | supports-sleepmode; |
73 | gpio-controller; | 77 | gpio-controller; |
74 | #gpio-cells = <2>; | 78 | #gpio-cells = <2>; |
@@ -80,6 +84,8 @@ | |||
80 | "st,nomadik-gpio"; | 84 | "st,nomadik-gpio"; |
81 | reg = <0x8000e000 0x80>; | 85 | reg = <0x8000e000 0x80>; |
82 | interrupts = <0 121 0x4>; | 86 | interrupts = <0 121 0x4>; |
87 | interrupt-controller; | ||
88 | #interrupt-cells = <2>; | ||
83 | supports-sleepmode; | 89 | supports-sleepmode; |
84 | gpio-controller; | 90 | gpio-controller; |
85 | #gpio-cells = <2>; | 91 | #gpio-cells = <2>; |
@@ -91,6 +97,8 @@ | |||
91 | "st,nomadik-gpio"; | 97 | "st,nomadik-gpio"; |
92 | reg = <0x8000e080 0x80>; | 98 | reg = <0x8000e080 0x80>; |
93 | interrupts = <0 122 0x4>; | 99 | interrupts = <0 122 0x4>; |
100 | interrupt-controller; | ||
101 | #interrupt-cells = <2>; | ||
94 | supports-sleepmode; | 102 | supports-sleepmode; |
95 | gpio-controller; | 103 | gpio-controller; |
96 | #gpio-cells = <2>; | 104 | #gpio-cells = <2>; |
@@ -102,6 +110,8 @@ | |||
102 | "st,nomadik-gpio"; | 110 | "st,nomadik-gpio"; |
103 | reg = <0x8000e100 0x80>; | 111 | reg = <0x8000e100 0x80>; |
104 | interrupts = <0 123 0x4>; | 112 | interrupts = <0 123 0x4>; |
113 | interrupt-controller; | ||
114 | #interrupt-cells = <2>; | ||
105 | supports-sleepmode; | 115 | supports-sleepmode; |
106 | gpio-controller; | 116 | gpio-controller; |
107 | #gpio-cells = <2>; | 117 | #gpio-cells = <2>; |
@@ -113,6 +123,8 @@ | |||
113 | "st,nomadik-gpio"; | 123 | "st,nomadik-gpio"; |
114 | reg = <0x8000e180 0x80>; | 124 | reg = <0x8000e180 0x80>; |
115 | interrupts = <0 124 0x4>; | 125 | interrupts = <0 124 0x4>; |
126 | interrupt-controller; | ||
127 | #interrupt-cells = <2>; | ||
116 | supports-sleepmode; | 128 | supports-sleepmode; |
117 | gpio-controller; | 129 | gpio-controller; |
118 | #gpio-cells = <2>; | 130 | #gpio-cells = <2>; |
@@ -124,6 +136,8 @@ | |||
124 | "st,nomadik-gpio"; | 136 | "st,nomadik-gpio"; |
125 | reg = <0x8011e000 0x80>; | 137 | reg = <0x8011e000 0x80>; |
126 | interrupts = <0 125 0x4>; | 138 | interrupts = <0 125 0x4>; |
139 | interrupt-controller; | ||
140 | #interrupt-cells = <2>; | ||
127 | supports-sleepmode; | 141 | supports-sleepmode; |
128 | gpio-controller; | 142 | gpio-controller; |
129 | #gpio-cells = <2>; | 143 | #gpio-cells = <2>; |
@@ -135,6 +149,8 @@ | |||
135 | "st,nomadik-gpio"; | 149 | "st,nomadik-gpio"; |
136 | reg = <0x8011e080 0x80>; | 150 | reg = <0x8011e080 0x80>; |
137 | interrupts = <0 126 0x4>; | 151 | interrupts = <0 126 0x4>; |
152 | interrupt-controller; | ||
153 | #interrupt-cells = <2>; | ||
138 | supports-sleepmode; | 154 | supports-sleepmode; |
139 | gpio-controller; | 155 | gpio-controller; |
140 | #gpio-cells = <2>; | 156 | #gpio-cells = <2>; |
@@ -146,12 +162,18 @@ | |||
146 | "st,nomadik-gpio"; | 162 | "st,nomadik-gpio"; |
147 | reg = <0xa03fe000 0x80>; | 163 | reg = <0xa03fe000 0x80>; |
148 | interrupts = <0 127 0x4>; | 164 | interrupts = <0 127 0x4>; |
165 | interrupt-controller; | ||
166 | #interrupt-cells = <2>; | ||
149 | supports-sleepmode; | 167 | supports-sleepmode; |
150 | gpio-controller; | 168 | gpio-controller; |
151 | #gpio-cells = <2>; | 169 | #gpio-cells = <2>; |
152 | gpio-bank = <8>; | 170 | gpio-bank = <8>; |
153 | }; | 171 | }; |
154 | 172 | ||
173 | pinctrl { | ||
174 | compatible = "stericsson,nmk_pinctrl"; | ||
175 | }; | ||
176 | |||
155 | usb@a03e0000 { | 177 | usb@a03e0000 { |
156 | compatible = "stericsson,db8500-musb", | 178 | compatible = "stericsson,db8500-musb", |
157 | "mentor,musb"; | 179 | "mentor,musb"; |
@@ -169,20 +191,195 @@ | |||
169 | prcmu@80157000 { | 191 | prcmu@80157000 { |
170 | compatible = "stericsson,db8500-prcmu"; | 192 | compatible = "stericsson,db8500-prcmu"; |
171 | reg = <0x80157000 0x1000>; | 193 | reg = <0x80157000 0x1000>; |
172 | interrupts = <46 47>; | 194 | interrupts = <0 47 0x4>; |
173 | #address-cells = <1>; | 195 | #address-cells = <1>; |
174 | #size-cells = <1>; | 196 | #size-cells = <1>; |
175 | ranges; | 197 | ranges; |
176 | 198 | ||
177 | prcmu-timer-4@80157450 { | 199 | prcmu-timer-4@80157450 { |
178 | compatible = "stericsson,db8500-prcmu-timer-4"; | 200 | compatible = "stericsson,db8500-prcmu-timer-4"; |
179 | reg = <0x80157450 0xC>; | 201 | reg = <0x80157450 0xC>; |
180 | }; | 202 | }; |
181 | 203 | ||
204 | db8500-prcmu-regulators { | ||
205 | compatible = "stericsson,db8500-prcmu-regulator"; | ||
206 | |||
207 | // DB8500_REGULATOR_VAPE | ||
208 | db8500_vape_reg: db8500_vape { | ||
209 | regulator-name = "db8500-vape"; | ||
210 | regulator-always-on; | ||
211 | }; | ||
212 | |||
213 | // DB8500_REGULATOR_VARM | ||
214 | db8500_varm_reg: db8500_varm { | ||
215 | regulator-name = "db8500-varm"; | ||
216 | }; | ||
217 | |||
218 | // DB8500_REGULATOR_VMODEM | ||
219 | db8500_vmodem_reg: db8500_vmodem { | ||
220 | regulator-name = "db8500-vmodem"; | ||
221 | }; | ||
222 | |||
223 | // DB8500_REGULATOR_VPLL | ||
224 | db8500_vpll_reg: db8500_vpll { | ||
225 | regulator-name = "db8500-vpll"; | ||
226 | }; | ||
227 | |||
228 | // DB8500_REGULATOR_VSMPS1 | ||
229 | db8500_vsmps1_reg: db8500_vsmps1 { | ||
230 | regulator-name = "db8500-vsmps1"; | ||
231 | }; | ||
232 | |||
233 | // DB8500_REGULATOR_VSMPS2 | ||
234 | db8500_vsmps2_reg: db8500_vsmps2 { | ||
235 | regulator-name = "db8500-vsmps2"; | ||
236 | }; | ||
237 | |||
238 | // DB8500_REGULATOR_VSMPS3 | ||
239 | db8500_vsmps3_reg: db8500_vsmps3 { | ||
240 | regulator-name = "db8500-vsmps3"; | ||
241 | }; | ||
242 | |||
243 | // DB8500_REGULATOR_VRF1 | ||
244 | db8500_vrf1_reg: db8500_vrf1 { | ||
245 | regulator-name = "db8500-vrf1"; | ||
246 | }; | ||
247 | |||
248 | // DB8500_REGULATOR_SWITCH_SVAMMDSP | ||
249 | db8500_sva_mmdsp_reg: db8500_sva_mmdsp { | ||
250 | regulator-name = "db8500-sva-mmdsp"; | ||
251 | }; | ||
252 | |||
253 | // DB8500_REGULATOR_SWITCH_SVAMMDSPRET | ||
254 | db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret { | ||
255 | regulator-name = "db8500-sva-mmdsp-ret"; | ||
256 | }; | ||
257 | |||
258 | // DB8500_REGULATOR_SWITCH_SVAPIPE | ||
259 | db8500_sva_pipe_reg: db8500_sva_pipe { | ||
260 | regulator-name = "db8500_sva_pipe"; | ||
261 | }; | ||
262 | |||
263 | // DB8500_REGULATOR_SWITCH_SIAMMDSP | ||
264 | db8500_sia_mmdsp_reg: db8500_sia_mmdsp { | ||
265 | regulator-name = "db8500_sia_mmdsp"; | ||
266 | }; | ||
267 | |||
268 | // DB8500_REGULATOR_SWITCH_SIAMMDSPRET | ||
269 | db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret { | ||
270 | regulator-name = "db8500-sia-mmdsp-ret"; | ||
271 | }; | ||
272 | |||
273 | // DB8500_REGULATOR_SWITCH_SIAPIPE | ||
274 | db8500_sia_pipe_reg: db8500_sia_pipe { | ||
275 | regulator-name = "db8500-sia-pipe"; | ||
276 | }; | ||
277 | |||
278 | // DB8500_REGULATOR_SWITCH_SGA | ||
279 | db8500_sga_reg: db8500_sga { | ||
280 | regulator-name = "db8500-sga"; | ||
281 | vin-supply = <&db8500_vape_reg>; | ||
282 | }; | ||
283 | |||
284 | // DB8500_REGULATOR_SWITCH_B2R2_MCDE | ||
285 | db8500_b2r2_mcde_reg: db8500_b2r2_mcde { | ||
286 | regulator-name = "db8500-b2r2-mcde"; | ||
287 | vin-supply = <&db8500_vape_reg>; | ||
288 | }; | ||
289 | |||
290 | // DB8500_REGULATOR_SWITCH_ESRAM12 | ||
291 | db8500_esram12_reg: db8500_esram12 { | ||
292 | regulator-name = "db8500-esram12"; | ||
293 | }; | ||
294 | |||
295 | // DB8500_REGULATOR_SWITCH_ESRAM12RET | ||
296 | db8500_esram12_ret_reg: db8500_esram12_ret { | ||
297 | regulator-name = "db8500-esram12-ret"; | ||
298 | }; | ||
299 | |||
300 | // DB8500_REGULATOR_SWITCH_ESRAM34 | ||
301 | db8500_esram34_reg: db8500_esram34 { | ||
302 | regulator-name = "db8500-esram34"; | ||
303 | }; | ||
304 | |||
305 | // DB8500_REGULATOR_SWITCH_ESRAM34RET | ||
306 | db8500_esram34_ret_reg: db8500_esram34_ret { | ||
307 | regulator-name = "db8500-esram34-ret"; | ||
308 | }; | ||
309 | }; | ||
310 | |||
182 | ab8500@5 { | 311 | ab8500@5 { |
183 | compatible = "stericsson,ab8500"; | 312 | compatible = "stericsson,ab8500"; |
184 | reg = <5>; /* mailbox 5 is i2c */ | 313 | reg = <5>; /* mailbox 5 is i2c */ |
185 | interrupts = <0 40 0x4>; | 314 | interrupts = <0 40 0x4>; |
315 | |||
316 | ab8500-regulators { | ||
317 | compatible = "stericsson,ab8500-regulator"; | ||
318 | |||
319 | // supplies to the display/camera | ||
320 | ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { | ||
321 | regulator-name = "V-DISPLAY"; | ||
322 | regulator-min-microvolt = <2500000>; | ||
323 | regulator-max-microvolt = <2900000>; | ||
324 | regulator-boot-on; | ||
325 | /* BUG: If turned off MMC will be affected. */ | ||
326 | regulator-always-on; | ||
327 | }; | ||
328 | |||
329 | // supplies to the on-board eMMC | ||
330 | ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { | ||
331 | regulator-name = "V-eMMC1"; | ||
332 | regulator-min-microvolt = <1100000>; | ||
333 | regulator-max-microvolt = <3300000>; | ||
334 | }; | ||
335 | |||
336 | // supply for VAUX3; SDcard slots | ||
337 | ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { | ||
338 | regulator-name = "V-MMC-SD"; | ||
339 | regulator-min-microvolt = <1100000>; | ||
340 | regulator-max-microvolt = <3300000>; | ||
341 | }; | ||
342 | |||
343 | // supply for v-intcore12; VINTCORE12 LDO | ||
344 | ab8500_ldo_initcore_reg: ab8500_ldo_initcore { | ||
345 | regulator-name = "V-INTCORE"; | ||
346 | }; | ||
347 | |||
348 | // supply for tvout; gpadc; TVOUT LDO | ||
349 | ab8500_ldo_tvout_reg: ab8500_ldo_tvout { | ||
350 | regulator-name = "V-TVOUT"; | ||
351 | }; | ||
352 | |||
353 | // supply for ab8500-usb; USB LDO | ||
354 | ab8500_ldo_usb_reg: ab8500_ldo_usb { | ||
355 | regulator-name = "dummy"; | ||
356 | }; | ||
357 | |||
358 | // supply for ab8500-vaudio; VAUDIO LDO | ||
359 | ab8500_ldo_audio_reg: ab8500_ldo_audio { | ||
360 | regulator-name = "V-AUD"; | ||
361 | }; | ||
362 | |||
363 | // supply for v-anamic1 VAMic1-LDO | ||
364 | ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { | ||
365 | regulator-name = "V-AMIC1"; | ||
366 | }; | ||
367 | |||
368 | // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 | ||
369 | ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { | ||
370 | regulator-name = "V-AMIC2"; | ||
371 | }; | ||
372 | |||
373 | // supply for v-dmic; VDMIC LDO | ||
374 | ab8500_ldo_dmic_reg: ab8500_ldo_dmic { | ||
375 | regulator-name = "V-DMIC"; | ||
376 | }; | ||
377 | |||
378 | // supply for U8500 CSI/DSI; VANA LDO | ||
379 | ab8500_ldo_ana_reg: ab8500_ldo_ana { | ||
380 | regulator-name = "V-CSI/DSI"; | ||
381 | }; | ||
382 | }; | ||
186 | }; | 383 | }; |
187 | }; | 384 | }; |
188 | 385 | ||
@@ -235,7 +432,8 @@ | |||
235 | status = "disabled"; | 432 | status = "disabled"; |
236 | 433 | ||
237 | // Add one of these for each child device | 434 | // Add one of these for each child device |
238 | cs-gpios = <&gpio0 31 &gpio4 14 &gpio4 16 &gpio6 22 &gpio7 0>; | 435 | cs-gpios = <&gpio0 31 0x4 &gpio4 14 0x4 &gpio4 16 0x4 |
436 | &gpio6 22 0x4 &gpio7 0 0x4>; | ||
239 | 437 | ||
240 | }; | 438 | }; |
241 | 439 | ||
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 5ca0cdb76413..4272b2949228 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -30,6 +30,22 @@ | |||
30 | reg = <0x10481000 0x1000>, <0x10482000 0x2000>; | 30 | reg = <0x10481000 0x1000>, <0x10482000 0x2000>; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | combiner:interrupt-controller@10440000 { | ||
34 | compatible = "samsung,exynos4210-combiner"; | ||
35 | #interrupt-cells = <2>; | ||
36 | interrupt-controller; | ||
37 | samsung,combiner-nr = <32>; | ||
38 | reg = <0x10440000 0x1000>; | ||
39 | interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, | ||
40 | <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, | ||
41 | <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, | ||
42 | <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, | ||
43 | <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>, | ||
44 | <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>, | ||
45 | <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>, | ||
46 | <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; | ||
47 | }; | ||
48 | |||
33 | watchdog { | 49 | watchdog { |
34 | compatible = "samsung,s3c2410-wdt"; | 50 | compatible = "samsung,s3c2410-wdt"; |
35 | reg = <0x101D0000 0x100>; | 51 | reg = <0x101D0000 0x100>; |
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 2b1a166d41f9..386c769c38d1 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
@@ -213,5 +213,14 @@ | |||
213 | status = "disabled"; | 213 | status = "disabled"; |
214 | }; | 214 | }; |
215 | }; | 215 | }; |
216 | nand@d8000000 { | ||
217 | #address-cells = <1>; | ||
218 | #size-cells = <1>; | ||
219 | |||
220 | compatible = "fsl,imx27-nand"; | ||
221 | reg = <0xd8000000 0x1000>; | ||
222 | interrupts = <29>; | ||
223 | status = "disabled"; | ||
224 | }; | ||
216 | }; | 225 | }; |
217 | }; | 226 | }; |
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index 2d696866f71c..3f5dad801a98 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi | |||
@@ -215,45 +215,8 @@ | |||
215 | gpio: gpio@40028000 { | 215 | gpio: gpio@40028000 { |
216 | compatible = "nxp,lpc3220-gpio"; | 216 | compatible = "nxp,lpc3220-gpio"; |
217 | reg = <0x40028000 0x1000>; | 217 | reg = <0x40028000 0x1000>; |
218 | /* create a private address space for enumeration */ | 218 | gpio-controller; |
219 | #address-cells = <1>; | 219 | #gpio-cells = <3>; /* bank, pin, flags */ |
220 | #size-cells = <0>; | ||
221 | |||
222 | gpio_p0: gpio-bank@0 { | ||
223 | gpio-controller; | ||
224 | #gpio-cells = <2>; | ||
225 | reg = <0>; | ||
226 | }; | ||
227 | |||
228 | gpio_p1: gpio-bank@1 { | ||
229 | gpio-controller; | ||
230 | #gpio-cells = <2>; | ||
231 | reg = <1>; | ||
232 | }; | ||
233 | |||
234 | gpio_p2: gpio-bank@2 { | ||
235 | gpio-controller; | ||
236 | #gpio-cells = <2>; | ||
237 | reg = <2>; | ||
238 | }; | ||
239 | |||
240 | gpio_p3: gpio-bank@3 { | ||
241 | gpio-controller; | ||
242 | #gpio-cells = <2>; | ||
243 | reg = <3>; | ||
244 | }; | ||
245 | |||
246 | gpi_p3: gpio-bank@4 { | ||
247 | gpio-controller; | ||
248 | #gpio-cells = <2>; | ||
249 | reg = <4>; | ||
250 | }; | ||
251 | |||
252 | gpo_p3: gpio-bank@5 { | ||
253 | gpio-controller; | ||
254 | #gpio-cells = <2>; | ||
255 | reg = <5>; | ||
256 | }; | ||
257 | }; | 220 | }; |
258 | 221 | ||
259 | watchdog@4003C000 { | 222 | watchdog@4003C000 { |
diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts b/arch/arm/boot/dts/mmp2-brownstone.dts index 153a4b2d12b5..c9b4f27d191e 100644 --- a/arch/arm/boot/dts/mmp2-brownstone.dts +++ b/arch/arm/boot/dts/mmp2-brownstone.dts | |||
@@ -11,7 +11,7 @@ | |||
11 | /include/ "mmp2.dtsi" | 11 | /include/ "mmp2.dtsi" |
12 | 12 | ||
13 | / { | 13 | / { |
14 | model = "Marvell MMP2 Aspenite Development Board"; | 14 | model = "Marvell MMP2 Brownstone Development Board"; |
15 | compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; | 15 | compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; |
16 | 16 | ||
17 | chosen { | 17 | chosen { |
@@ -19,7 +19,7 @@ | |||
19 | }; | 19 | }; |
20 | 20 | ||
21 | memory { | 21 | memory { |
22 | reg = <0x00000000 0x04000000>; | 22 | reg = <0x00000000 0x08000000>; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | soc { | 25 | soc { |
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi index f2ab4ea7cc0e..581cb081cb0f 100644 --- a/arch/arm/boot/dts/omap2.dtsi +++ b/arch/arm/boot/dts/omap2.dtsi | |||
@@ -44,6 +44,8 @@ | |||
44 | compatible = "ti,omap2-intc"; | 44 | compatible = "ti,omap2-intc"; |
45 | interrupt-controller; | 45 | interrupt-controller; |
46 | #interrupt-cells = <1>; | 46 | #interrupt-cells = <1>; |
47 | ti,intc-size = <96>; | ||
48 | reg = <0x480FE000 0x1000>; | ||
47 | }; | 49 | }; |
48 | 50 | ||
49 | uart1: serial@4806a000 { | 51 | uart1: serial@4806a000 { |
diff --git a/arch/arm/boot/dts/phy3250.dts b/arch/arm/boot/dts/phy3250.dts index 0167e86314c0..c4ff6d1a018b 100644 --- a/arch/arm/boot/dts/phy3250.dts +++ b/arch/arm/boot/dts/phy3250.dts | |||
@@ -131,13 +131,13 @@ | |||
131 | compatible = "gpio-leds"; | 131 | compatible = "gpio-leds"; |
132 | 132 | ||
133 | led0 { | 133 | led0 { |
134 | gpios = <&gpo_p3 1 1>; /* GPO_P3 1, GPIO 80, active low */ | 134 | gpios = <&gpio 5 1 1>; /* GPO_P3 1, GPIO 80, active low */ |
135 | linux,default-trigger = "heartbeat"; | 135 | linux,default-trigger = "heartbeat"; |
136 | default-state = "off"; | 136 | default-state = "off"; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | led1 { | 139 | led1 { |
140 | gpios = <&gpo_p3 14 1>; /* GPO_P3 14, GPIO 93, active low */ | 140 | gpios = <&gpio 5 14 1>; /* GPO_P3 14, GPIO 93, active low */ |
141 | linux,default-trigger = "timer"; | 141 | linux,default-trigger = "timer"; |
142 | default-state = "off"; | 142 | default-state = "off"; |
143 | }; | 143 | }; |
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index d99dc04f0d91..ec3c33975110 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts | |||
@@ -20,6 +20,16 @@ | |||
20 | reg = <0x00000000 0x20000000>; | 20 | reg = <0x00000000 0x20000000>; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | en_3v3_reg: en_3v3 { | ||
24 | compatible = "regulator-fixed"; | ||
25 | regulator-name = "en-3v3-fixed-supply"; | ||
26 | regulator-min-microvolt = <3300000>; | ||
27 | regulator-max-microvolt = <3300000>; | ||
28 | gpios = <&gpio0 26 0x4>; // 26 | ||
29 | startup-delay-us = <5000>; | ||
30 | enable-active-high; | ||
31 | }; | ||
32 | |||
23 | gpio_keys { | 33 | gpio_keys { |
24 | compatible = "gpio-keys"; | 34 | compatible = "gpio-keys"; |
25 | #address-cells = <1>; | 35 | #address-cells = <1>; |
@@ -30,35 +40,35 @@ | |||
30 | wakeup = <1>; | 40 | wakeup = <1>; |
31 | linux,code = <2>; | 41 | linux,code = <2>; |
32 | label = "userpb"; | 42 | label = "userpb"; |
33 | gpios = <&gpio1 0 0>; | 43 | gpios = <&gpio1 0 0x4>; |
34 | }; | 44 | }; |
35 | button@2 { | 45 | button@2 { |
36 | debounce_interval = <50>; | 46 | debounce_interval = <50>; |
37 | wakeup = <1>; | 47 | wakeup = <1>; |
38 | linux,code = <3>; | 48 | linux,code = <3>; |
39 | label = "extkb1"; | 49 | label = "extkb1"; |
40 | gpios = <&gpio4 23 0>; | 50 | gpios = <&gpio4 23 0x4>; |
41 | }; | 51 | }; |
42 | button@3 { | 52 | button@3 { |
43 | debounce_interval = <50>; | 53 | debounce_interval = <50>; |
44 | wakeup = <1>; | 54 | wakeup = <1>; |
45 | linux,code = <4>; | 55 | linux,code = <4>; |
46 | label = "extkb2"; | 56 | label = "extkb2"; |
47 | gpios = <&gpio4 24 0>; | 57 | gpios = <&gpio4 24 0x4>; |
48 | }; | 58 | }; |
49 | button@4 { | 59 | button@4 { |
50 | debounce_interval = <50>; | 60 | debounce_interval = <50>; |
51 | wakeup = <1>; | 61 | wakeup = <1>; |
52 | linux,code = <5>; | 62 | linux,code = <5>; |
53 | label = "extkb3"; | 63 | label = "extkb3"; |
54 | gpios = <&gpio5 1 0>; | 64 | gpios = <&gpio5 1 0x4>; |
55 | }; | 65 | }; |
56 | button@5 { | 66 | button@5 { |
57 | debounce_interval = <50>; | 67 | debounce_interval = <50>; |
58 | wakeup = <1>; | 68 | wakeup = <1>; |
59 | linux,code = <6>; | 69 | linux,code = <6>; |
60 | label = "extkb4"; | 70 | label = "extkb4"; |
61 | gpios = <&gpio5 2 0>; | 71 | gpios = <&gpio5 2 0x4>; |
62 | }; | 72 | }; |
63 | }; | 73 | }; |
64 | 74 | ||
@@ -66,12 +76,11 @@ | |||
66 | compatible = "gpio-leds"; | 76 | compatible = "gpio-leds"; |
67 | used-led { | 77 | used-led { |
68 | label = "user_led"; | 78 | label = "user_led"; |
69 | gpios = <&gpio4 14>; | 79 | gpios = <&gpio4 14 0x4>; |
70 | }; | 80 | }; |
71 | }; | 81 | }; |
72 | 82 | ||
73 | soc-u9500 { | 83 | soc-u9500 { |
74 | |||
75 | external-bus@50000000 { | 84 | external-bus@50000000 { |
76 | status = "okay"; | 85 | status = "okay"; |
77 | 86 | ||
@@ -80,6 +89,9 @@ | |||
80 | reg = <0 0x10000>; | 89 | reg = <0 0x10000>; |
81 | interrupts = <12 0x1>; | 90 | interrupts = <12 0x1>; |
82 | interrupt-parent = <&gpio4>; | 91 | interrupt-parent = <&gpio4>; |
92 | vdd33a-supply = <&en_3v3_reg>; | ||
93 | vddvario-supply = <&db8500_vape_reg>; | ||
94 | |||
83 | 95 | ||
84 | reg-shift = <1>; | 96 | reg-shift = <1>; |
85 | reg-io-width = <2>; | 97 | reg-io-width = <2>; |
@@ -91,11 +103,13 @@ | |||
91 | 103 | ||
92 | sdi@80126000 { | 104 | sdi@80126000 { |
93 | status = "enabled"; | 105 | status = "enabled"; |
94 | cd-gpios = <&gpio6 26>; | 106 | vmmc-supply = <&ab8500_ldo_aux3_reg>; |
107 | cd-gpios = <&gpio6 26 0x4>; // 218 | ||
95 | }; | 108 | }; |
96 | 109 | ||
97 | sdi@80114000 { | 110 | sdi@80114000 { |
98 | status = "enabled"; | 111 | status = "enabled"; |
112 | vmmc-supply = <&ab8500_ldo_aux2_reg>; | ||
99 | }; | 113 | }; |
100 | 114 | ||
101 | uart@80120000 { | 115 | uart@80120000 { |
@@ -114,7 +128,7 @@ | |||
114 | tc3589x@42 { | 128 | tc3589x@42 { |
115 | //compatible = "tc3589x"; | 129 | //compatible = "tc3589x"; |
116 | reg = <0x42>; | 130 | reg = <0x42>; |
117 | interrupts = <25>; | 131 | gpios = <&gpio6 25 0x4>; |
118 | interrupt-parent = <&gpio6>; | 132 | interrupt-parent = <&gpio6>; |
119 | }; | 133 | }; |
120 | tps61052@33 { | 134 | tps61052@33 { |
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts index 8314e4171884..dd4358bc26e2 100644 --- a/arch/arm/boot/dts/spear1310-evb.dts +++ b/arch/arm/boot/dts/spear1310-evb.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr1310 Evaluation Baord | 2 | * DTS file for SPEAr1310 Evaluation Baord |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi index 9e61da404d57..419ea7413d23 100644 --- a/arch/arm/boot/dts/spear1310.dtsi +++ b/arch/arm/boot/dts/spear1310.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for all SPEAr1310 SoCs | 2 | * DTS file for all SPEAr1310 SoCs |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts index 0d8472e5ab9f..c9a54e06fb68 100644 --- a/arch/arm/boot/dts/spear1340-evb.dts +++ b/arch/arm/boot/dts/spear1340-evb.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr1340 Evaluation Baord | 2 | * DTS file for SPEAr1340 Evaluation Baord |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi index a26fc47a55e8..d71fe2a68f09 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for all SPEAr1340 SoCs | 2 | * DTS file for all SPEAr1340 SoCs |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi index 1f8e1e1481df..10dcec7e7321 100644 --- a/arch/arm/boot/dts/spear13xx.dtsi +++ b/arch/arm/boot/dts/spear13xx.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for all SPEAr13xx SoCs | 2 | * DTS file for all SPEAr13xx SoCs |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear300-evb.dts b/arch/arm/boot/dts/spear300-evb.dts index fc82b1a26458..d71b8d581e3d 100644 --- a/arch/arm/boot/dts/spear300-evb.dts +++ b/arch/arm/boot/dts/spear300-evb.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr300 Evaluation Baord | 2 | * DTS file for SPEAr300 Evaluation Baord |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi index 01c5e358fdb2..ed3627c116cc 100644 --- a/arch/arm/boot/dts/spear300.dtsi +++ b/arch/arm/boot/dts/spear300.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr300 SoC | 2 | * DTS file for SPEAr300 SoC |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear310-evb.dts b/arch/arm/boot/dts/spear310-evb.dts index dc5e2d445a93..b00544e0cd5d 100644 --- a/arch/arm/boot/dts/spear310-evb.dts +++ b/arch/arm/boot/dts/spear310-evb.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr310 Evaluation Baord | 2 | * DTS file for SPEAr310 Evaluation Baord |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi index e47081c494d9..62fc4fb3e5f9 100644 --- a/arch/arm/boot/dts/spear310.dtsi +++ b/arch/arm/boot/dts/spear310.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr310 SoC | 2 | * DTS file for SPEAr310 SoC |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear320-evb.dts b/arch/arm/boot/dts/spear320-evb.dts index 6308fa3bec1e..c13fd1f3b09f 100644 --- a/arch/arm/boot/dts/spear320-evb.dts +++ b/arch/arm/boot/dts/spear320-evb.dts | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr320 Evaluation Baord | 2 | * DTS file for SPEAr320 Evaluation Baord |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi index 5372ca399b1f..1f49d69595a0 100644 --- a/arch/arm/boot/dts/spear320.dtsi +++ b/arch/arm/boot/dts/spear320.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for SPEAr320 SoC | 2 | * DTS file for SPEAr320 SoC |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/spear3xx.dtsi b/arch/arm/boot/dts/spear3xx.dtsi index 91072553963f..3a8bb5736928 100644 --- a/arch/arm/boot/dts/spear3xx.dtsi +++ b/arch/arm/boot/dts/spear3xx.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * DTS file for all SPEAr3xx SoCs | 2 | * DTS file for all SPEAr3xx SoCs |
3 | * | 3 | * |
4 | * Copyright 2012 Viresh Kumar <viresh.kumar@st.com> | 4 | * Copyright 2012 Viresh Kumar <viresh.linux@gmail.com> |
5 | * | 5 | * |
6 | * The code contained herein is licensed under the GNU General Public | 6 | * The code contained herein is licensed under the GNU General Public |
7 | * License. You may obtain a copy of the GNU General Public License | 7 | * License. You may obtain a copy of the GNU General Public License |
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts index 941b161ab78c..7e1091d91af8 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | |||
@@ -73,7 +73,10 @@ | |||
73 | #address-cells = <0>; | 73 | #address-cells = <0>; |
74 | interrupt-controller; | 74 | interrupt-controller; |
75 | reg = <0x2c001000 0x1000>, | 75 | reg = <0x2c001000 0x1000>, |
76 | <0x2c002000 0x100>; | 76 | <0x2c002000 0x1000>, |
77 | <0x2c004000 0x2000>, | ||
78 | <0x2c006000 0x2000>; | ||
79 | interrupts = <1 9 0xf04>; | ||
77 | }; | 80 | }; |
78 | 81 | ||
79 | memory-controller@7ffd0000 { | 82 | memory-controller@7ffd0000 { |
@@ -93,6 +96,14 @@ | |||
93 | <0 91 4>; | 96 | <0 91 4>; |
94 | }; | 97 | }; |
95 | 98 | ||
99 | timer { | ||
100 | compatible = "arm,armv7-timer"; | ||
101 | interrupts = <1 13 0xf08>, | ||
102 | <1 14 0xf08>, | ||
103 | <1 11 0xf08>, | ||
104 | <1 10 0xf08>; | ||
105 | }; | ||
106 | |||
96 | pmu { | 107 | pmu { |
97 | compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu"; | 108 | compatible = "arm,cortex-a15-pmu", "arm,cortex-a9-pmu"; |
98 | interrupts = <0 68 4>, | 109 | interrupts = <0 68 4>, |
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts index 6905e66d4748..18917a0f8604 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca5s.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca5s.dts | |||
@@ -77,13 +77,18 @@ | |||
77 | 77 | ||
78 | timer@2c000600 { | 78 | timer@2c000600 { |
79 | compatible = "arm,cortex-a5-twd-timer"; | 79 | compatible = "arm,cortex-a5-twd-timer"; |
80 | reg = <0x2c000600 0x38>; | 80 | reg = <0x2c000600 0x20>; |
81 | interrupts = <1 2 0x304>, | 81 | interrupts = <1 13 0x304>; |
82 | <1 3 0x304>; | 82 | }; |
83 | |||
84 | watchdog@2c000620 { | ||
85 | compatible = "arm,cortex-a5-twd-wdt"; | ||
86 | reg = <0x2c000620 0x20>; | ||
87 | interrupts = <1 14 0x304>; | ||
83 | }; | 88 | }; |
84 | 89 | ||
85 | gic: interrupt-controller@2c001000 { | 90 | gic: interrupt-controller@2c001000 { |
86 | compatible = "arm,corex-a5-gic", "arm,cortex-a9-gic"; | 91 | compatible = "arm,cortex-a5-gic", "arm,cortex-a9-gic"; |
87 | #interrupt-cells = <3>; | 92 | #interrupt-cells = <3>; |
88 | #address-cells = <0>; | 93 | #address-cells = <0>; |
89 | interrupt-controller; | 94 | interrupt-controller; |
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca9.dts b/arch/arm/boot/dts/vexpress-v2p-ca9.dts index da778693be54..3f0c736d31d6 100644 --- a/arch/arm/boot/dts/vexpress-v2p-ca9.dts +++ b/arch/arm/boot/dts/vexpress-v2p-ca9.dts | |||
@@ -105,8 +105,13 @@ | |||
105 | timer@1e000600 { | 105 | timer@1e000600 { |
106 | compatible = "arm,cortex-a9-twd-timer"; | 106 | compatible = "arm,cortex-a9-twd-timer"; |
107 | reg = <0x1e000600 0x20>; | 107 | reg = <0x1e000600 0x20>; |
108 | interrupts = <1 2 0xf04>, | 108 | interrupts = <1 13 0xf04>; |
109 | <1 3 0xf04>; | 109 | }; |
110 | |||
111 | watchdog@1e000620 { | ||
112 | compatible = "arm,cortex-a9-twd-wdt"; | ||
113 | reg = <0x1e000620 0x20>; | ||
114 | interrupts = <1 14 0xf04>; | ||
110 | }; | 115 | }; |
111 | 116 | ||
112 | gic: interrupt-controller@1e001000 { | 117 | gic: interrupt-controller@1e001000 { |