aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stübner <heiko@sntech.de>2014-08-14 17:01:50 -0400
committerHeiko Stuebner <heiko@sntech.de>2014-09-02 16:28:32 -0400
commitac42f481b75b98076b47fac60796657508f80abe (patch)
treede76fda32f61764995b17db067e2a459f92a9637
parent982891c3859f310935226c58ad84f3fb88a79e54 (diff)
ARM: dts: rockchip: add rk3066 and rk3188 dma controllers
Add both the cpu and peripheral pl330 dma controllers present in rk3188 socs. The first dma controller can change between secure and non-secure mode. Both instances are added but the non-secure variant is left disabled by default, as on the majority of boards the bootloader leaves it in secure mode. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm/boot/dts/rk3xxx.dtsi38
1 files changed, 38 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 8caf85d83901..b5bd3a6593ef 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -28,6 +28,44 @@
28 i2c4 = &i2c4; 28 i2c4 = &i2c4;
29 }; 29 };
30 30
31 amba {
32 compatible = "arm,amba-bus";
33 #address-cells = <1>;
34 #size-cells = <1>;
35 ranges;
36
37 dmac1_s: dma-controller@20018000 {
38 compatible = "arm,pl330", "arm,primecell";
39 reg = <0x20018000 0x4000>;
40 interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
41 <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
42 #dma-cells = <1>;
43 clocks = <&cru ACLK_DMA1>;
44 clock-names = "apb_pclk";
45 };
46
47 dmac1_ns: dma-controller@2001c000 {
48 compatible = "arm,pl330", "arm,primecell";
49 reg = <0x2001c000 0x4000>;
50 interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
51 <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
52 #dma-cells = <1>;
53 clocks = <&cru ACLK_DMA1>;
54 clock-names = "apb_pclk";
55 status = "disabled";
56 };
57
58 dmac2: dma-controller@20078000 {
59 compatible = "arm,pl330", "arm,primecell";
60 reg = <0x20078000 0x4000>;
61 interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
62 <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
63 #dma-cells = <1>;
64 clocks = <&cru ACLK_DMA2>;
65 clock-names = "apb_pclk";
66 };
67 };
68
31 xin24m: oscillator { 69 xin24m: oscillator {
32 compatible = "fixed-clock"; 70 compatible = "fixed-clock";
33 clock-frequency = <24000000>; 71 clock-frequency = <24000000>;