Merge remote-tracking branch 'slave-dma/next'

[karo-tx-linux.git] / arch / arm / boot / dts / am335x-evm.dts

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index d9d00ab863a21735312ff2d53a6830c48ad425ff..a378a3adbeaf1099909ea085004edd0e9fd4f9e5 100644 (file)
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -743,8 +743,8 @@
 &mmc3 {
        /* these are on the crossbar and are outlined in the
           xbar-event-map element */
-       dmas = <&edma 12
-               &edma 13>;
+       dmas = <&edma_xbar 12 0 1
+               &edma_xbar 13 0 2>;
        dma-names = "tx", "rx";
        status = "okay";
        vmmc-supply = <&wlan_en_reg>;
@@ -766,11 +766,6 @@
        };
 };
 
-&edma {
-       ti,edma-xbar-event-map = /bits/ 16 <1 12
-                                           2 13>;
-};
-
 &sham {
        status = "okay";
 };