Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / arch / arm / boot / dts / prima2.dtsi

diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 0ca0d7f..2014552 100644 (file)
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -224,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 {
@@ -244,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 {
@@ -255,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 {
@@ -266,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 {
@@ -277,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 {