Merge branch 'topic/nhlt' into for-next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / dm816x.dtsi

diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 1edc2b4..2a4934b 100644 (file)
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -4,6 +4,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/bus/ti-sysc.h>
+#include <dt-bindings/clock/dm816.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/omap.h>
 
@@ -138,13 +140,123 @@
                        };
                };
 
-               edma: edma@49000000 {
-                       compatible = "ti,edma3";
-                       ti,hwmods = "tpcc", "tptc0", "tptc1", "tptc2", "tptc3";
-                       reg =   <0x49000000 0x10000>,
-                               <0x44e10f90 0x40>;
-                       interrupts = <12 13 14>;
-                       #dma-cells = <1>;
+               target-module@49000000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x49000000 0x4>;
+                       reg-names = "rev";
+                       clocks = <&alwon_clkctrl DM816_TPCC_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x49000000 0x10000>;
+
+                       edma: dma@0 {
+                               compatible = "ti,edma3-tpcc";
+                               reg = <0 0x10000>;
+                               reg-names = "edma3_cc";
+                               interrupts = <12 13 14>;
+                               interrupt-names = "edma3_ccint", "edma3_mperr",
+                                                 "edma3_ccerrint";
+                               dma-requests = <64>;
+                               #dma-cells = <2>;
+
+                               ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
+                                          <&edma_tptc2 3>, <&edma_tptc3 0>;
+
+                               ti,edma-memcpy-channels = <20 21>;
+                       };
+               };
+
+               target-module@49800000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x49800000 0x4>,
+                             <0x49800010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_SMART>;
+                       clocks = <&alwon_clkctrl DM816_TPTC0_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x49800000 0x100000>;
+
+                       edma_tptc0: dma@0 {
+                               compatible = "ti,edma3-tptc";
+                               reg = <0 0x100000>;
+                               interrupts = <112>;
+                               interrupt-names = "edma3_tcerrint";
+                       };
+               };
+
+               target-module@49900000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x49900000 0x4>,
+                             <0x49900010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_SMART>;
+                       clocks = <&alwon_clkctrl DM816_TPTC1_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x49900000 0x100000>;
+
+                       edma_tptc1: dma@0 {
+                               compatible = "ti,edma3-tptc";
+                               reg = <0 0x100000>;
+                               interrupts = <113>;
+                               interrupt-names = "edma3_tcerrint";
+                       };
+               };
+
+               target-module@49a00000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x49a00000 0x4>,
+                             <0x49a00010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_SMART>;
+                       clocks = <&alwon_clkctrl DM816_TPTC2_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x49a00000 0x100000>;
+
+                       edma_tptc2: dma@0 {
+                               compatible = "ti,edma3-tptc";
+                               reg = <0 0x100000>;
+                               interrupts = <114>;
+                               interrupt-names = "edma3_tcerrint";
+                       };
+               };
+
+               target-module@49b00000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x49b00000 0x4>,
+                             <0x49b00010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_SMART>;
+                       clocks = <&alwon_clkctrl DM816_TPTC3_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x49b00000 0x100000>;
+
+                       edma_tptc3: dma@0 {
+                               compatible = "ti,edma3-tptc";
+                               reg = <0 0x100000>;
+                               interrupts = <115>;
+                               interrupt-names = "edma3_tcerrint";
+                       };
                };
 
                elm: elm@48080000 {
@@ -185,7 +297,7 @@
                        #address-cells = <2>;
                        #size-cells = <1>;
                        interrupts = <100>;
-                       dmas = <&edma 52>;
+                       dmas = <&edma 52 0>;
                        dma-names = "rxtx";
                        gpmc,num-cs = <6>;
                        gpmc,num-waitpins = <2>;
@@ -202,7 +314,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <70>;
-                       dmas = <&edma 58 &edma 59>;
+                       dmas = <&edma 58 0 &edma 59 0>;
                        dma-names = "tx", "rx";
                };
 
@@ -213,7 +325,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <71>;
-                       dmas = <&edma 60 &edma 61>;
+                       dmas = <&edma 60 0 &edma 61 0>;
                        dma-names = "tx", "rx";
                };
 
@@ -311,10 +423,10 @@
                        interrupts = <65>;
                        ti,spi-num-cs = <4>;
                        ti,hwmods = "mcspi1";
-                       dmas = <&edma 16 &edma 17
-                               &edma 18 &edma 19
-                               &edma 20 &edma 21
-                               &edma 22 &edma 23>;
+                       dmas = <&edma 16 0 &edma 17 0
+                               &edma 18 0 &edma 19 0
+                               &edma 20 0 &edma 21 0
+                               &edma 22 0 &edma 23 0>;
                        dma-names = "tx0", "rx0", "tx1", "rx1",
                                    "tx2", "rx2", "tx3", "rx3";
                };
@@ -324,7 +436,7 @@
                        reg = <0x48060000 0x11000>;
                        ti,hwmods = "mmc1";
                        interrupts = <64>;
-                       dmas = <&edma 24 &edma 25>;
+                       dmas = <&edma 24 0 &edma 25 0>;
                        dma-names = "tx", "rx";
                };
 
@@ -392,7 +504,7 @@
                        reg = <0x48020000 0x2000>;
                        clock-frequency = <48000000>;
                        interrupts = <72>;
-                       dmas = <&edma 26 &edma 27>;
+                       dmas = <&edma 26 0 &edma 27 0>;
                        dma-names = "tx", "rx";
                };
 
@@ -402,7 +514,7 @@
                        reg = <0x48022000 0x2000>;
                        clock-frequency = <48000000>;
                        interrupts = <73>;
-                       dmas = <&edma 28 &edma 29>;
+                       dmas = <&edma 28 0 &edma 29 0>;
                        dma-names = "tx", "rx";
                };
 
@@ -412,7 +524,7 @@
                        reg = <0x48024000 0x2000>;
                        clock-frequency = <48000000>;
                        interrupts = <74>;
-                       dmas = <&edma 30 &edma 31>;
+                       dmas = <&edma 30 0 &edma 31 0>;
                        dma-names = "tx", "rx";
                };