ARM: dts: Configure interconnect target module for am4 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/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 43e7d3ea2d937713165bcf5b1c17dce0836d4a1a..5da4414011fd8a840da0e8cc9ed726357a42f95f 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -173,14 +173,6 @@
                             <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
 
                l4_wkup: interconnect@44c00000 {
-                       wkup_m3: wkup_m3@100000 {
-                               compatible = "ti,am4372-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 {
                };

diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index e6ef7d6190a180ffa19e45296a5a070e8308ab41..e944bc7ce48b3f0ecf57cdb00cdae556b2380b64 100644 (file)
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -32,19 +32,26 @@
                         <0x000f0000 0x001f0000 0x010000>;      /* ap 8 */
 
                target-module@0 {                       /* 0x44d00000, ap 4 28.0 */
-                       compatible = "ti,sysc";
-                       status = "disabled";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       ti,hwmods = "wkup_m3";
+                       reg = <0x0 0x4>;
+                       reg-names = "rev";
+                       clocks = <&l4_wkup_aon_clkctrl AM4_L4_WKUP_AON_WKUP_M3_CLKCTRL 0>;
+                       clock-names = "fck";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges = <0x0 0x0 0x4000>;
-               };
+                       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,am4372-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";
+                       };
                };
 
                target-module@f0000 {                   /* 0x44df0000, ap 8 58.0 */