diff options
author | Heiko Stuebner <heiko@sntech.de> | 2013-09-29 07:25:08 -0400 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2013-10-14 17:03:20 -0400 |
commit | f75efdd7687a366cb8a096c40bd44430abdf0cab (patch) | |
tree | e40c43ffc69db96efc895698688cdd13c03bf553 /arch/arm/boot/dts/rk3066a.dtsi | |
parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) |
ARM: rockchip: move shared dt properties to common source file
The rk3188 SoC shares a lot of peripherals with the rk3066 SoC,
but not all. Therefore move the common parts to a shared dtsi.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot/dts/rk3066a.dtsi')
-rw-r--r-- | arch/arm/boot/dts/rk3066a.dtsi | 98 |
1 files changed, 1 insertions, 97 deletions
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 56bfac93d3f6..2218c64410de 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi | |||
@@ -14,15 +14,12 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <dt-bindings/gpio/gpio.h> | 16 | #include <dt-bindings/gpio/gpio.h> |
17 | #include <dt-bindings/interrupt-controller/irq.h> | ||
18 | #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
19 | #include <dt-bindings/pinctrl/rockchip.h> | 17 | #include <dt-bindings/pinctrl/rockchip.h> |
20 | #include "skeleton.dtsi" | 18 | #include "rk3xxx.dtsi" |
21 | #include "rk3066a-clocks.dtsi" | 19 | #include "rk3066a-clocks.dtsi" |
22 | 20 | ||
23 | / { | 21 | / { |
24 | compatible = "rockchip,rk3066a"; | 22 | compatible = "rockchip,rk3066a"; |
25 | interrupt-parent = <&gic>; | ||
26 | 23 | ||
27 | cpus { | 24 | cpus { |
28 | #address-cells = <1>; | 25 | #address-cells = <1>; |
@@ -43,33 +40,6 @@ | |||
43 | }; | 40 | }; |
44 | 41 | ||
45 | soc { | 42 | soc { |
46 | #address-cells = <1>; | ||
47 | #size-cells = <1>; | ||
48 | compatible = "simple-bus"; | ||
49 | ranges; | ||
50 | |||
51 | gic: interrupt-controller@1013d000 { | ||
52 | compatible = "arm,cortex-a9-gic"; | ||
53 | interrupt-controller; | ||
54 | #interrupt-cells = <3>; | ||
55 | reg = <0x1013d000 0x1000>, | ||
56 | <0x1013c100 0x0100>; | ||
57 | }; | ||
58 | |||
59 | L2: l2-cache-controller@10138000 { | ||
60 | compatible = "arm,pl310-cache"; | ||
61 | reg = <0x10138000 0x1000>; | ||
62 | cache-unified; | ||
63 | cache-level = <2>; | ||
64 | }; | ||
65 | |||
66 | local-timer@1013c600 { | ||
67 | compatible = "arm,cortex-a9-twd-timer"; | ||
68 | reg = <0x1013c600 0x20>; | ||
69 | interrupts = <GIC_PPI 13 0x304>; | ||
70 | clocks = <&dummy150m>; | ||
71 | }; | ||
72 | |||
73 | timer@20038000 { | 43 | timer@20038000 { |
74 | compatible = "snps,dw-apb-timer-osc"; | 44 | compatible = "snps,dw-apb-timer-osc"; |
75 | reg = <0x20038000 0x100>; | 45 | reg = <0x20038000 0x100>; |
@@ -320,71 +290,5 @@ | |||
320 | }; | 290 | }; |
321 | }; | 291 | }; |
322 | }; | 292 | }; |
323 | |||
324 | uart0: serial@10124000 { | ||
325 | compatible = "snps,dw-apb-uart"; | ||
326 | reg = <0x10124000 0x400>; | ||
327 | interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; | ||
328 | reg-shift = <2>; | ||
329 | reg-io-width = <1>; | ||
330 | clocks = <&clk_gates1 8>; | ||
331 | status = "disabled"; | ||
332 | }; | ||
333 | |||
334 | uart1: serial@10126000 { | ||
335 | compatible = "snps,dw-apb-uart"; | ||
336 | reg = <0x10126000 0x400>; | ||
337 | interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; | ||
338 | reg-shift = <2>; | ||
339 | reg-io-width = <1>; | ||
340 | clocks = <&clk_gates1 10>; | ||
341 | status = "disabled"; | ||
342 | }; | ||
343 | |||
344 | uart2: serial@20064000 { | ||
345 | compatible = "snps,dw-apb-uart"; | ||
346 | reg = <0x20064000 0x400>; | ||
347 | interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; | ||
348 | reg-shift = <2>; | ||
349 | reg-io-width = <1>; | ||
350 | clocks = <&clk_gates1 12>; | ||
351 | status = "disabled"; | ||
352 | }; | ||
353 | |||
354 | uart3: serial@20068000 { | ||
355 | compatible = "snps,dw-apb-uart"; | ||
356 | reg = <0x20068000 0x400>; | ||
357 | interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; | ||
358 | reg-shift = <2>; | ||
359 | reg-io-width = <1>; | ||
360 | clocks = <&clk_gates1 14>; | ||
361 | status = "disabled"; | ||
362 | }; | ||
363 | |||
364 | dwmmc@10214000 { | ||
365 | compatible = "rockchip,rk2928-dw-mshc"; | ||
366 | reg = <0x10214000 0x1000>; | ||
367 | interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; | ||
368 | #address-cells = <1>; | ||
369 | #size-cells = <0>; | ||
370 | |||
371 | clocks = <&clk_gates5 10>, <&clk_gates2 11>; | ||
372 | clock-names = "biu", "ciu"; | ||
373 | |||
374 | status = "disabled"; | ||
375 | }; | ||
376 | |||
377 | dwmmc@10218000 { | ||
378 | compatible = "rockchip,rk2928-dw-mshc"; | ||
379 | reg = <0x10218000 0x1000>; | ||
380 | interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; | ||
381 | #address-cells = <1>; | ||
382 | #size-cells = <0>; | ||
383 | |||
384 | clocks = <&clk_gates5 11>, <&clk_gates2 13>; | ||
385 | clock-names = "biu", "ciu"; | ||
386 | |||
387 | status = "disabled"; | ||
388 | }; | ||
389 | }; | 293 | }; |
390 | }; | 294 | }; |