Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / omap5-l4.dtsi

diff --git a/arch/arm/boot/dts/omap5-l4.dtsi b/arch/arm/boot/dts/omap5-l4.dtsi
index 1581876ff7524c0dd48c717aa300f2f0a927d82e..34410b7d77e2fd8f91a259d505af0578088f017a 100644 (file)
--- a/arch/arm/boot/dts/omap5-l4.dtsi
+++ b/arch/arm/boot/dts/omap5-l4.dtsi
@@ -348,7 +348,6 @@
 
                target-module@66000 {                   /* 0x4a066000, ap 23 0a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "mmu_dsp";
                        reg = <0x66000 0x4>,
                              <0x66010 0x4>,
                              <0x66014 0x4>;
@@ -363,12 +362,18 @@
                        /* Domains (V, P, C): mm, dsp_pwrdm, dsp_clkdm */
                        clocks = <&dsp_clkctrl OMAP5_MMU_DSP_CLKCTRL 0>;
                        clock-names = "fck";
+                       resets = <&prm_dsp 1>;
+                       reset-names = "rstctrl";
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x66000 0x1000>;
 
-                       /* mmu_dsp cannot be moved before reset driver */
-                       status = "disabled";
+                       mmu_dsp: mmu@0 {
+                               compatible = "ti,omap4-iommu";
+                               reg = <0x0 0x100>;
+                               interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                               #iommu-cells = <0>;
+                       };
                };
 
                target-module@70000 {                   /* 0x4a070000, ap 79 2e.0 */
@@ -429,7 +434,6 @@
 
                target-module@0 {                       /* 0x4a080000, ap 83 28.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "ocp2scp1";
                        reg = <0x0 0x4>,
                              <0x10 0x4>,
                              <0x14 0x4>;
@@ -487,7 +491,6 @@
 
                target-module@10000 {                   /* 0x4a090000, ap 89 36.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "ocp2scp3";
                        reg = <0x10000 0x4>,
                              <0x10010 0x4>,
                              <0x10014 0x4>;
@@ -626,7 +629,6 @@
 
                target-module@76000 {                   /* 0x4a0f6000, ap 27 0c.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "spinlock";
                        reg = <0x76000 0x4>,
                              <0x76010 0x4>,
                              <0x76014 0x4>;
@@ -1060,7 +1062,6 @@
 
                target-module@32000 {                   /* 0x48032000, ap 5 3e.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer2";
                        reg = <0x32000 0x4>,
                              <0x32010 0x4>;
                        reg-names = "rev", "sysc";
@@ -1088,7 +1089,6 @@
 
                target-module@34000 {                   /* 0x48034000, ap 7 46.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer3";
                        reg = <0x34000 0x4>,
                              <0x34010 0x4>;
                        reg-names = "rev", "sysc";
@@ -1116,7 +1116,6 @@
 
                target-module@36000 {                   /* 0x48036000, ap 9 4e.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer4";
                        reg = <0x36000 0x4>,
                              <0x36010 0x4>;
                        reg-names = "rev", "sysc";
@@ -1144,7 +1143,6 @@
 
                target-module@3e000 {                   /* 0x4803e000, ap 11 56.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer9";
                        reg = <0x3e000 0x4>,
                              <0x3e010 0x4>;
                        reg-names = "rev", "sysc";
@@ -1712,7 +1710,6 @@
 
                target-module@86000 {                   /* 0x48086000, ap 41 5e.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer10";
                        reg = <0x86000 0x4>,
                              <0x86010 0x4>;
                        reg-names = "rev", "sysc";
@@ -1741,7 +1738,6 @@
 
                target-module@88000 {                   /* 0x48088000, ap 43 66.0 */
                        compatible = "ti,sysc-omap4-timer", "ti,sysc";
-                       ti,hwmods = "timer11";
                        reg = <0x88000 0x4>,
                              <0x88010 0x4>;
                        reg-names = "rev", "sysc";
@@ -2357,7 +2353,6 @@
 
                target-module@c000 {                    /* 0x4ae1c000, ap 11 1c.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
-                       ti,hwmods = "kbd";
                        reg = <0xc000 0x4>,
                              <0xc010 0x4>;
                        reg-names = "rev", "sysc";