ARM: dts: Configure interconnect target module for am3 wkup_m3

We can now probe devices with device tree only configuration using
ti-sysc interconnect target module driver.

Note that we no longer need ti,no-reset-on-init as the rstctrl resets
are properly handled by the reset driver and claimed by the RTC driver.
And we need to squash together the module ranges for driver compability.

Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index ddfb27d38dffbf5107c38038eae3d675f96d55cf..7fa2312b13e841a9deac18e0e28798751b1a7988 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -32,20 +32,25 @@
 
                target-module@0 {                       /* 0x44d00000, ap 4 28.0 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
+                       ti,hwmods = "wkup_m3";
                        reg = <0x0 0x4>;
                        reg-names = "rev";
+                       clocks = <&l4_wkup_aon_clkctrl AM3_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>;
+                       clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges = <0x0 0x0 0x4000>;
-                       status = "disabled";
-               };
+                       ranges = <0x00000000 0x00000000 0x4000>,
+                                <0x00080000 0x00080000 0x2000>;
 
-               target-module@80000 {                   /* 0x44d80000, ap 6 10.0 */
-                       compatible = "ti,sysc";
-                       status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0x0 0x80000 0x2000>;
+                       wkup_m3: cpu@0 {
+                               compatible = "ti,am3352-wkup-m3";
+                               reg = <0x00000000 0x4000>,
+                                     <0x00080000 0x2000>;
+                               reg-names = "umem", "dmem";
+                               resets = <&prm_wkup 3>;
+                               reset-names = "rstctrl";
+                               ti,pm-firmware = "am335x-pm-firmware.elf";
+                       };
                };
        };
 

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index c777a865b5d29c87cdbe06f2e3be51acc07bbda8..fe9cdd2c09963b37356543aebfdd4fe3613eb926 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -180,14 +180,6 @@
                ti,hwmods = "l3_main";
 
                l4_wkup: interconnect@44c00000 {
-                       wkup_m3: wkup_m3@100000 {
-                               compatible = "ti,am3352-wkup-m3";
-                               reg = <0x100000 0x4000>,
-                                     <0x180000 0x2000>;
-                               reg-names = "umem", "dmem";
-                               ti,hwmods = "wkup_m3";
-                               ti,pm-firmware = "am335x-pm-firmware.elf";
-                       };
                };
                l4_per: interconnect@48000000 {
                };