Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2485496..4759048 100644 (file)
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -395,7 +395,7 @@
                };
 
                target-module@48076000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "slimbus2";
                        reg = <0x48076000 0x4>,
                              <0x48076010 0x4>;
@@ -475,7 +475,7 @@
                };
 
                target-module@4a0db000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_iva";
                        reg = <0x4a0db038 0x4>;
                        reg-names = "sysc";
@@ -498,7 +498,7 @@
                };
 
                target-module@4a0dd000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_core";
                        reg = <0x4a0dd038 0x4>;
                        reg-names = "sysc";
@@ -521,7 +521,7 @@
                };
 
                target-module@4a0d9000 {
-                       compatible = "ti,sysc-sr";
+                       compatible = "ti,sysc-omap4-sr", "ti,sysc";
                        ti,hwmods = "smartreflex_mpu";
                        reg = <0x4a0d9038 0x4>;
                        reg-names = "sysc";
@@ -747,7 +747,7 @@
                };
 
                target-module@52000000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "iss";
                        reg = <0x52000000 0x4>,
                              <0x52000010 0x4>;
@@ -866,7 +866,7 @@
                };
 
                target-module@40128000 {
-                       compatible = "ti,sysc-mcasp";
+                       compatible = "ti,sysc-mcasp", "ti,sysc";
                        ti,hwmods = "mcasp";
                        reg = <0x40128000 0x4>,
                              <0x40128004 0x4>;
@@ -891,7 +891,7 @@
                };
 
                target-module@4012c000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "slimbus1";
                        reg = <0x4012c000 0x4>,
                              <0x4012c010 0x4>;
@@ -912,7 +912,7 @@
                };
 
                target-module@401f1000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "aess";
                        reg = <0x401f1000 0x4>,
                              <0x401f1010 0x4>;
@@ -1027,7 +1027,7 @@
                };
 
                target-module@4a10a000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "fdif";
                        reg = <0x4a10a000 0x4>,
                              <0x4a10a010 0x4>;
@@ -1266,7 +1266,7 @@
                };
 
                target-module@56000000 {
-                       compatible = "ti,sysc-omap4";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
                        ti,hwmods = "gpu";
                        reg = <0x5601fc00 0x4>,
                              <0x5601fc10 0x4>;