ARM: dts: Revert am335x mcasp ti-sysc changes

Without this McASP FIFO would constantly underflow. EDMA
test via dmatest works though.

Let's revert the change for now until we know the root cause.

Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index 918bf57..fd99e23 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1056,19 +1056,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x38000 0x2000>;
-
-                       mcasp0: mcasp@0 {
-                               compatible = "ti,am33xx-mcasp-audio";
-                               reg = <0x0 0x2000>,
-                                     <0x46000000 0x400000>;
-                               reg-names = "mpu", "dat";
-                               interrupts = <80>, <81>;
-                               interrupt-names = "tx", "rx";
-                               status = "disabled";
-                               dmas = <&edma 8 2>,
-                                       <&edma 9 2>;
-                               dma-names = "tx", "rx";
-                       };
+                       status = "disabled";
                };
 
                target-module@3c000 {                   /* 0x4803c000, ap 20 32.0 */
@@ -1086,19 +1074,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x3c000 0x2000>;
-
-                       mcasp1: mcasp@0 {
-                               compatible = "ti,am33xx-mcasp-audio";
-                               reg = <0x0 0x2000>,
-                                     <0x46400000 0x400000>;
-                               reg-names = "mpu", "dat";
-                               interrupts = <82>, <83>;
-                               interrupt-names = "tx", "rx";
-                               status = "disabled";
-                               dmas = <&edma 10 2>,
-                                       <&edma 11 2>;
-                               dma-names = "tx", "rx";
-                       };
+                       status = "disabled";
                };
 
                target-module@40000 {                   /* 0x48040000, ap 22 1e.0 */

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index e5c2f71..fc07d2d 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -440,7 +440,36 @@
                               <&edma 5 0>;
                        dma-names = "tx", "rx";
                };
+
+               mcasp0: mcasp@48038000 {
+                       compatible = "ti,am33xx-mcasp-audio";
+                       ti,hwmods = "mcasp0";
+                       reg = <0x48038000 0x2000>,
+                             <0x46000000 0x400000>;
+                       reg-names = "mpu", "dat";
+                       interrupts = <80>, <81>;
+                       interrupt-names = "tx", "rx";
+                       status = "disabled";
+                       dmas = <&edma 8 2>,
+                               <&edma 9 2>;
+                       dma-names = "tx", "rx";
+               };
+
+               mcasp1: mcasp@4803c000 {
+                       compatible = "ti,am33xx-mcasp-audio";
+                       ti,hwmods = "mcasp1";
+                       reg = <0x4803C000 0x2000>,
+                             <0x46400000 0x400000>;
+                       reg-names = "mpu", "dat";
+                       interrupts = <82>, <83>;
+                       interrupt-names = "tx", "rx";
+                       status = "disabled";
+                       dmas = <&edma 10 2>,
+                               <&edma 11 2>;
+                       dma-names = "tx", "rx";
+               };
        };
+
 };
 
 #include "am33xx-l4.dtsi"