Merge tag 'fscache-next-20210829' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / omap4-l4-abe.dtsi

diff --git a/arch/arm/boot/dts/omap4-l4-abe.dtsi b/arch/arm/boot/dts/omap4-l4-abe.dtsi
index a9573d4..7ae8b62 100644 (file)
--- a/arch/arm/boot/dts/omap4-l4-abe.dtsi
+++ b/arch/arm/boot/dts/omap4-l4-abe.dtsi
@@ -186,37 +186,39 @@
                };
 
                target-module@28000 {                   /* 0x40128000, ap 8 08.0 */
+                                                       /* 0x4012a000, ap 10 0a.0 */
                        compatible = "ti,sysc-mcasp", "ti,sysc";
                        reg = <0x28000 0x4>,
                              <0x28004 0x4>;
                        reg-names = "rev", "sysc";
                        ti,sysc-sidle = <SYSC_IDLE_FORCE>,
                                        <SYSC_IDLE_NO>,
-                                       <SYSC_IDLE_SMART>,
-                                       <SYSC_IDLE_SMART_WKUP>;
+                                       <SYSC_IDLE_SMART>;
                        /* Domains (V, P, C): iva, abe_pwrdm, abe_clkdm */
                        clocks = <&abe_clkctrl OMAP4_MCASP_CLKCTRL 0>;
                        clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x28000 0x1000>,
-                                <0x49028000 0x49028000 0x1000>;
-
-                       /*
-                        * Child device unsupported by davinci-mcasp. At least
-                        * RX path is disabled for omap4, and only DIT mode
-                        * works with no I2S. See also old Android kernel
-                        * omap-mcasp driver for more information.
-                        */
-               };
-
-               target-module@2a000 {                   /* 0x4012a000, ap 10 0a.0 */
-                       compatible = "ti,sysc";
-                       status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0x0 0x2a000 0x1000>,
+                                <0x49028000 0x49028000 0x1000>,
+                                <0x2000 0x2a000 0x1000>,
                                 <0x4902a000 0x4902a000 0x1000>;
+
+                       mcasp0: mcasp@0 {
+                               compatible = "ti,omap4-mcasp-audio";
+                               reg = <0x0 0x2000>,
+                                     <0x4902a000 0x1000>;      /* L3 data port */
+                               reg-names = "mpu","dat";
+                               interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-names = "tx";
+                               dmas = <&sdma 8>;
+                               dma-names = "tx";
+                               clocks = <&abe_clkctrl OMAP4_MCASP_CLKCTRL 0>;
+                               clock-names = "fck";
+                               op-mode = <1>;  /* MCASP_DIT_MODE */
+                               serial-dir = < 1 >; /* 1 TX serializers */
+                               status = "disabled";
+                       };
                };
 
                target-module@2e000 {                   /* 0x4012e000, ap 12 0c.0 */