Revert "ARM: DTS: am437x: Use the new DT bindings for the eDMA3"

This reverts commit e3faf2b8826b8ac58cdaad7f801e59e389320f0e as it causes
regression in BBB

Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 461548ed69fd500063cc902502e2fc3821c8a308..0447c04a40cc439d90296c0f9d70b541eedf18b8 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -183,56 +183,14 @@
                };
 
                edma: edma@49000000 {
-                       compatible = "ti,edma3-tpcc";
-                       ti,hwmods = "tpcc";
-                       reg =   <0x49000000 0x10000>;
-                       reg-names = "edma3_cc";
+                       compatible = "ti,edma3";
+                       ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2";
+                       reg =   <0x49000000 0x10000>,
+                               <0x44e10f90 0x10>;
                        interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "edma3_ccint", "emda3_mperr",
-                                         "edma3_ccerrint";
-                       dma-requests = <64>;
-                       #dma-cells = <2>;
-
-                       ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
-                                  <&edma_tptc2 0>;
-
-                       ti,edma-memcpy-channels = /bits/ 16 <32 33>;
-               };
-
-               edma_tptc0: tptc@49800000 {
-                       compatible = "ti,edma3-tptc";
-                       ti,hwmods = "tptc0";
-                       reg =   <0x49800000 0x100000>;
-                       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "edma3_tcerrint";
-               };
-
-               edma_tptc1: tptc@49900000 {
-                       compatible = "ti,edma3-tptc";
-                       ti,hwmods = "tptc1";
-                       reg =   <0x49900000 0x100000>;
-                       interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "edma3_tcerrint";
-               };
-
-               edma_tptc2: tptc@49a00000 {
-                       compatible = "ti,edma3-tptc";
-                       ti,hwmods = "tptc2";
-                       reg =   <0x49a00000 0x100000>;
-                       interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "edma3_tcerrint";
-               };
-
-               edma_xbar: dma-router@44e10f90 {
-                       compatible = "ti,am335x-edma-crossbar";
-                       reg = <0x44e10f90 0x40>;
-
-                       #dma-cells = <3>;
-                       dma-requests = <64>;
-
-                       dma-masters = <&edma>;
+                                       <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
+                                       <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                       #dma-cells = <1>;
                };
 
                uart0: serial@44e09000 {
@@ -537,8 +495,8 @@
                        ti,hwmods = "mmc1";
                        ti,dual-volt;
                        ti,needs-special-reset;
-                       dmas = <&edma 24 0>,
-                               <&edma 25 0>;
+                       dmas = <&edma 24
+                               &edma 25>;
                        dma-names = "tx", "rx";
                        interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
@@ -549,8 +507,8 @@
                        reg = <0x481d8000 0x1000>;
                        ti,hwmods = "mmc2";
                        ti,needs-special-reset;
-                       dmas = <&edma 2 0>,
-                               <&edma 3 0>;
+                       dmas = <&edma 2
+                               &edma 3>;
                        dma-names = "tx", "rx";
                        interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
@@ -817,7 +775,7 @@
                        compatible = "ti,omap5-sham";
                        ti,hwmods = "sham";
                        reg = <0x53100000 0x300>;
-                       dmas = <&edma 36 0>;
+                       dmas = <&edma 36>;
                        dma-names = "rx";
                        interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
                };
@@ -827,8 +785,8 @@
                        ti,hwmods = "aes";
                        reg = <0x53501000 0xa0>;
                        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-                       dmas = <&edma 6 0>,
-                               <&edma 5 0>;
+                       dmas = <&edma 6
+                               &edma 5>;
                        dma-names = "tx", "rx";
                };
 
@@ -837,8 +795,8 @@
                        ti,hwmods = "des";
                        reg = <0x53701000 0xa0>;
                        interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
-                       dmas = <&edma 34 0>,
-                               <&edma 33 0>;
+                       dmas = <&edma 34
+                               &edma 33>;
                        dma-names = "tx", "rx";
                };
 
@@ -851,8 +809,8 @@
                        interrupts = <80>, <81>;
                        interrupt-names = "tx", "rx";
                        status = "disabled";
-                       dmas = <&edma 8 2>,
-                              <&edma 9 2>;
+                       dmas = <&edma 8>,
+                              <&edma 9>;
                        dma-names = "tx", "rx";
                };
 
@@ -865,8 +823,8 @@
                        interrupts = <82>, <83>;
                        interrupt-names = "tx", "rx";
                        status = "disabled";
-                       dmas = <&edma 10 2>,
-                              <&edma 11 2>;
+                       dmas = <&edma 10>,
+                              <&edma 11>;
                        dma-names = "tx", "rx";
                };
 

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 28e3b252c08c1eff94e2f9103d960577f09c6c28..22038f21f2283a30cdac9235f0a6a2171813264e 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -711,8 +711,8 @@
        status = "okay";
        /* these are on the crossbar and are outlined in the
           xbar-event-map element */
-       dmas = <&edma_xbar 30 0 1>,
-               <&edma_xbar 31 0 2>;
+       dmas = <&edma 30
+               &edma 31>;
        dma-names = "tx", "rx";
        vmmc-supply = <&vmmcwl_fixed>;
        bus-width = <4>;
@@ -733,6 +733,11 @@
        };
 };
 
+&edma {
+       ti,edma-xbar-event-map = /bits/ 16 <1 30
+                                           2 31>;
+};
+
 &uart3 {
        status = "okay";
        pinctrl-names = "default";