Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / am335x-pepper.dts

diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 39073b921664e5a3f8477b1691c391829048ce61..7106114c74647cd2e76499a6f5654ddf5f98f73d 100644 (file)
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -339,6 +339,13 @@
        ti,non-removable;
 };
 
+&edma {
+       /* Map eDMA MMC2 Events from Crossbar */
+       ti,edma-xbar-event-map = /bits/ 16 <1 12
+                                            2 13>;
+};
+
+
 &mmc3 {
        /* Wifi & Bluetooth on MMC #3 */
        status = "okay";
@@ -347,8 +354,8 @@
        vmmmc-supply = <&v3v3c_reg>;
        bus-width = <4>;
        ti,non-removable;
-       dmas = <&edma_xbar 12 0 1
-               &edma_xbar 13 0 2>;
+       dmas = <&edma 12
+               &edma 13>;
        dma-names = "tx", "rx";
 };