5 files changed, 65 insertions, 50 deletions

diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index c90724bded10..f164dce08755 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -31,7 +31,7 @@
                         status = "disabled";
                         reg = <0x5c000000 0x30000>;
                         interrupts = <67 68 69 70>;
-                        syscon = <&omap3_scm_general>;
+                        syscon = <&scm_conf>;
                         ti,davinci-ctrl-reg-offset = <0x10000>;
                         ti,davinci-ctrl-mod-reg-offset = <0>;
                         ti,davinci-ctrl-ram-offset = <0x20000>;
diff --git a/arch/arm/boot/dts/am35xx-clocks.dtsi b/arch/arm/boot/dts/am35xx-clocks.dtsi
index df489d310b50..518b8fde88b0 100644
--- a/arch/arm/boot/dts/am35xx-clocks.dtsi
+++ b/arch/arm/boot/dts/am35xx-clocks.dtsi
@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-&scrm_clocks {
+&scm_clocks {
         emac_ick: emac_ick {
                 #clock-cells = <0>;
                 compatible = "ti,am35xx-gate-clock";
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 01b71111bd55..b28791ade27a 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -87,6 +87,60 @@
                 ranges;
                 ti,hwmods = "l3_main";
 
+                l4_core: l4@48000000 {
+                        compatible = "ti,omap3-l4-core", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 0x48000000 0x1000000>;
+
+                        scm: scm@2000 {
+                                compatible = "ti,omap3-scm", "simple-bus";
+                                reg = <0x2000 0x2000>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x2000 0x2000>;
+
+                                omap3_pmx_core: pinmux@30 {
+                                        compatible = "ti,omap3-padconf",
+                                                     "pinctrl-single";
+                                        reg = <0x30 0x238>;
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        #interrupt-cells = <1>;
+                                        interrupt-controller;
+                                        pinctrl-single,register-width = <16>;
+                                        pinctrl-single,function-mask = <0xff1f>;
+                                };
+
+                                scm_conf: scm_conf@270 {
+                                        compatible = "syscon";
+                                        reg = <0x270 0x330>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+
+                                        scm_clocks: clocks {
+                                                #address-cells = <1>;
+                                                #size-cells = <0>;
+                                        };
+                                };
+
+                                scm_clockdomains: clockdomains {
+                                };
+
+                                omap3_pmx_wkup: pinmux@a00 {
+                                        compatible = "ti,omap3-padconf",
+                                                     "pinctrl-single";
+                                        reg = <0xa00 0x5c>;
+                                        #address-cells = <1>;
+                                        #size-cells = <0>;
+                                        #interrupt-cells = <1>;
+                                        interrupt-controller;
+                                        pinctrl-single,register-width = <16>;
+                                        pinctrl-single,function-mask = <0xff1f>;
+                                };
+                        };
+                };
+
                 aes: aes@480c5000 {
                         compatible = "ti,omap3-aes";
                         ti,hwmods = "aes";
@@ -121,19 +175,6 @@
                         };
                 };
 
-                scrm: scrm@48002000 {
-                        compatible = "ti,omap3-scrm";
-                        reg = <0x48002000 0x2000>;
-
-                        scrm_clocks: clocks {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                        };
-
-                        scrm_clockdomains: clockdomains {
-                        };
-                };
-
                 counter32k: counter@48320000 {
                         compatible = "ti,omap-counter32k";
                         reg = <0x48320000 0x20>;
@@ -159,37 +200,10 @@
                         #dma-requests = <96>;
                 };
 
-                omap3_pmx_core: pinmux@48002030 {
-                        compatible = "ti,omap3-padconf", "pinctrl-single";
-                        reg = <0x48002030 0x0238>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        #interrupt-cells = <1>;
-                        interrupt-controller;
-                        pinctrl-single,register-width = <16>;
-                        pinctrl-single,function-mask = <0xff1f>;
-                };
-
-                omap3_pmx_wkup: pinmux@48002a00 {
-                        compatible = "ti,omap3-padconf", "pinctrl-single";
-                        reg = <0x48002a00 0x5c>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        #interrupt-cells = <1>;
-                        interrupt-controller;
-                        pinctrl-single,register-width = <16>;
-                        pinctrl-single,function-mask = <0xff1f>;
-                };
-
-                omap3_scm_general: tisyscon@48002270 {
-                        compatible = "syscon";
-                        reg = <0x48002270 0x2f0>;
-                };
-
                 pbias_regulator: pbias_regulator {
                         compatible = "ti,pbias-omap";
                         reg = <0x2b0 0x4>;
-                        syscon = <&omap3_scm_general>;
+                        syscon = <&scm_conf>;
                         pbias_mmc_reg: pbias_mmc_omap2430 {
                                 regulator-name = "pbias_mmc_omap2430";
                                 regulator-min-microvolt = <1800000>;
diff --git a/arch/arm/boot/dts/omap3xxx-clocks.dtsi b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
index 5c375003bad1..bbba5bdc4bc9 100644
--- a/arch/arm/boot/dts/omap3xxx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap3xxx-clocks.dtsi
@@ -79,13 +79,14 @@
                 clock-div = <1>;
         };
 };
-&scrm_clocks {
+
+&scm_clocks {
         mcbsp5_mux_fck: mcbsp5_mux_fck {
                 #clock-cells = <0>;
                 compatible = "ti,composite-mux-clock";
                 clocks = <&core_96m_fck>, <&mcbsp_clks>;
                 ti,bit-shift = <4>;
-                reg = <0x02d8>;
+                reg = <0x68>;
         };
 
         mcbsp5_fck: mcbsp5_fck {
@@ -99,7 +100,7 @@
                 compatible = "ti,composite-mux-clock";
                 clocks = <&core_96m_fck>, <&mcbsp_clks>;
                 ti,bit-shift = <2>;
-                reg = <0x0274>;
+                reg = <0x04>;
         };
 
         mcbsp1_fck: mcbsp1_fck {
@@ -113,7 +114,7 @@
                 compatible = "ti,composite-mux-clock";
                 clocks = <&per_96m_fck>, <&mcbsp_clks>;
                 ti,bit-shift = <6>;
-                reg = <0x0274>;
+                reg = <0x04>;
         };
 
         mcbsp2_fck: mcbsp2_fck {
@@ -126,7 +127,7 @@
                 #clock-cells = <0>;
                 compatible = "ti,composite-mux-clock";
                 clocks = <&per_96m_fck>, <&mcbsp_clks>;
-                reg = <0x02d8>;
+                reg = <0x68>;
         };
 
         mcbsp3_fck: mcbsp3_fck {
@@ -140,7 +141,7 @@
                 compatible = "ti,composite-mux-clock";
                 clocks = <&per_96m_fck>, <&mcbsp_clks>;
                 ti,bit-shift = <2>;
-                reg = <0x02d8>;
+                reg = <0x68>;
         };
 
         mcbsp4_fck: mcbsp4_fck {
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index eb592ea51b78..30f5aff7645f 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -670,7 +670,7 @@ static const struct of_device_id omap_scrm_dt_match_table[] = {
         { .compatible = "ti,am3-scrm", .data = &ctrl_data },
         { .compatible = "ti,am4-scrm", .data = &ctrl_data },
         { .compatible = "ti,omap2-scm", .data = &omap2_ctrl_data },
-        { .compatible = "ti,omap3-scrm", .data = &ctrl_data },
+        { .compatible = "ti,omap3-scm", .data = &omap2_ctrl_data },
         { .compatible = "ti,dm816-scrm", .data = &ctrl_data },
         { }
 };