Merge tag 'docs-5.11-2' of git://git.lwn.net/linux

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

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index cb164df..7808850 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1,5 +1,8 @@
 &l4_wkup {                                             /* 0x44c00000 */
-       compatible = "ti,am33xx-l4-wkup", "simple-bus";
+       compatible = "ti,am33xx-l4-wkup", "simple-pm-bus";
+       power-domains = <&prm_wkup>;
+       clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_L4_WKUP_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x44c00000 0x800>,
              <0x44c00800 0x800>,
              <0x44c01000 0x400>,
@@ -12,7 +15,7 @@
                 <0x00200000 0x44e00000 0x100000>;      /* segment 2 */
 
        segment@0 {                                     /* 0x44c00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00000000 0x000800>,      /* ap 0 */
@@ -22,7 +25,7 @@
        };
 
        segment@100000 {                                        /* 0x44d00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00100000 0x004000>,      /* ap 4 */
@@ -34,23 +37,27 @@
                        compatible = "ti,sysc-omap4", "ti,sysc";
                        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";
+                       };
                };
        };
 
        segment@200000 {                                        /* 0x44e00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00200000 0x002000>,      /* ap 8 */
@@ -274,6 +281,9 @@
                        compatible = "ti,sysc-omap4", "ti,sysc";
                        reg = <0x10000 0x4>;
                        reg-names = "rev";
+                       clocks = <&l4_wkup_clkctrl AM3_L4_WKUP_CONTROL_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x00000000 0x00010000 0x00010000>,
@@ -433,6 +443,7 @@
                                        <SYSC_IDLE_SMART>,
                                        <SYSC_IDLE_SMART_WKUP>;
                        /* Domains (P, C): rtc_pwrdm, l4_rtc_clkdm */
+                       power-domains = <&prm_rtc>;
                        clocks = <&l4_rtc_clkctrl AM3_L4_RTC_RTC_CLKCTRL 0>;
                        clock-names = "fck";
                        #address-cells = <1>;
@@ -658,7 +669,10 @@
 };
 
 &l4_fast {                                     /* 0x4a000000 */
-       compatible = "ti,am33xx-l4-fast", "simple-bus";
+       compatible = "ti,am33xx-l4-fast", "simple-pm-bus";
+       power-domains = <&prm_per>;
+       clocks = <&l4hs_clkctrl AM3_L4HS_L4_HS_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x4a000000 0x800>,
              <0x4a000800 0x800>,
              <0x4a001000 0x400>;
@@ -668,7 +682,7 @@
        ranges = <0x00000000 0x4a000000 0x1000000>;     /* segment 0 */
 
        segment@0 {                                     /* 0x4a000000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00000000 0x000800>,      /* ap 0 */
@@ -837,7 +851,10 @@
 };
 
 &l4_per {                                              /* 0x48000000 */
-       compatible = "ti,am33xx-l4-per", "simple-bus";
+       compatible = "ti,am33xx-l4-per", "simple-pm-bus";
+       power-domains = <&prm_per>;
+       clocks = <&l4ls_clkctrl AM3_L4LS_L4_LS_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x48000000 0x800>,
              <0x48000800 0x800>,
              <0x48001000 0x400>,
@@ -855,7 +872,7 @@
                 <0x46400000 0x46400000 0x400000>;      /* l3 data port */
 
        segment@0 {                                     /* 0x48000000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00000000 0x000800>,      /* ap 0 */
@@ -1466,7 +1483,7 @@
        };
 
        segment@100000 {                                        /* 0x48100000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0008c000 0x0018c000 0x001000>,      /* ap 42 */
@@ -1850,13 +1867,31 @@
        };
 
        segment@200000 {                                        /* 0x48200000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
+               ranges = <0x00000000 0x00200000 0x010000>;
+
+               target-module@0 {
+                       compatible = "ti,sysc-omap4-simple", "ti,sysc";
+                       power-domains = <&prm_mpu>;
+                       clocks = <&mpu_clkctrl AM3_MPU_MPU_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0x10000>;
+
+                       mpu@0 {
+                               compatible = "ti,omap3-mpu";
+                               pm-sram = <&pm_sram_code
+                                          &pm_sram_data>;
+                       };
+               };
        };
 
        segment@300000 {                                        /* 0x48300000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00300000 0x001000>,      /* ap 66 */