Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / arch / arm / boot / dts / prima2.dtsi

diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 3a15dee2e8ab2fc3c1cdb16b6a85cfcedfedd889..1e82571d6823ef55169af9827efab952189e952c 100644 (file)
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -76,9 +76,10 @@
                                #clock-cells = <1>;
                        };
 
-                       reset-controller@88010000 {
+                       rstc: reset-controller@88010000 {
                                compatible = "sirf,prima2-rstc";
                                reg = <0x88010000 0x1000>;
+                               #reset-cells = <1>;
                        };
 
                        rsc-controller@88020000 {
@@ -223,8 +224,8 @@
                                interrupts = <17>;
                                fifosize = <128>;
                                clocks = <&clks 13>;
-                               sirf,uart-dma-rx-channel = <21>;
-                               sirf,uart-dma-tx-channel = <2>;
+                               dmas = <&dmac1 5>, <&dmac0 2>;
+                               dma-names = "rx", "tx";
                        };
 
                        uart1: uart@b0060000 {
@@ -243,8 +244,8 @@
                                interrupts = <19>;
                                fifosize = <128>;
                                clocks = <&clks 15>;
-                               sirf,uart-dma-rx-channel = <6>;
-                               sirf,uart-dma-tx-channel = <7>;
+                               dmas = <&dmac0 6>, <&dmac0 7>;
+                               dma-names = "rx", "tx";
                        };
 
                        usp0: usp@b0080000 {
@@ -254,8 +255,8 @@
                                interrupts = <20>;
                                fifosize = <128>;
                                clocks = <&clks 28>;
-                               sirf,usp-dma-rx-channel = <17>;
-                               sirf,usp-dma-tx-channel = <18>;
+                               dmas = <&dmac1 1>, <&dmac1 2>;
+                               dma-names = "rx", "tx";
                        };
 
                        usp1: usp@b0090000 {
@@ -265,8 +266,8 @@
                                interrupts = <21>;
                                fifosize = <128>;
                                clocks = <&clks 29>;
-                               sirf,usp-dma-rx-channel = <14>;
-                               sirf,usp-dma-tx-channel = <15>;
+                               dmas = <&dmac0 14>, <&dmac0 15>;
+                               dma-names = "rx", "tx";
                        };
 
                        usp2: usp@b00a0000 {
@@ -276,8 +277,8 @@
                                interrupts = <22>;
                                fifosize = <128>;
                                clocks = <&clks 30>;
-                               sirf,usp-dma-rx-channel = <10>;
-                               sirf,usp-dma-tx-channel = <11>;
+                               dmas = <&dmac0 10>, <&dmac0 11>;
+                               dma-names = "rx", "tx";
                        };
 
                        dmac0: dma-controller@b00b0000 {