]> Git Repo - linux.git/commitdiff
Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Thu, 17 Dec 2020 00:53:54 +0000 (16:53 -0800)
committerLinus Torvalds <[email protected]>
Thu, 17 Dec 2020 00:53:54 +0000 (16:53 -0800)
Pull ARM SoC OMAP GenPD updates from Arnd Bergmann:
 "These are additional updates for the power domain support on OMAP,
  moving to an implementation based on device tree information instead
  of SoC specific code. This is the latest step in the ongoing process
  for moving code out of arch/arm/mach-omap2.

  I kept this separate from the other driver changes since it touches
  code in multiple areas"

* tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (51 commits)
  ARM: OMAP2+: Fix am4 only build after genpd changes
  ARM: dts: Configure power domain for omap5 dss
  ARM: dts: omap5: add remaining PRM instances
  soc: ti: omap-prm: omap5: add genpd support for remaining PRM instances
  ARM: OMAP2+: Drop legacy platform data for dra7 gpmc
  ARM: dts: Configure interconnect target module for dra7 iva
  ARM: dts: dra7: add remaining PRM instances
  soc: ti: omap-prm: dra7: add genpd support for remaining PRM instances
  clk: ti: dra7: Drop idlest polling from IVA clkctrl clocks
  ARM: OMAP2+: Drop legacy platform data for omap4 gpmc
  ARM: OMAP2+: Drop legacy platform data for omap4 iva
  ARM: dts: Configure power domain for omap4 dsp
  ARM: dts: Configure power domain for omap4 dss
  ARM: dts: omap4: add remaining PRM instances
  soc: ti: omap-prm: omap4: add genpd support for remaining PRM instances
  clk: ti: omap4: Drop idlest polling from IVA clkctrl clocks
  ARM: OMAP2+: Drop legacy remaining legacy platform data for am4
  ARM: dts: Use simple-pm-bus for genpd for am4 l3
  ARM: dts: Move am4 l3 noc to a separate node
  ARM: dts: Use simple-pm-bus for genpd for am4 l4_per
  ...

1  2 
arch/arm/boot/dts/am33xx-l4.dtsi
arch/arm/boot/dts/am437x-l4.dtsi
arch/arm/boot/dts/dra7.dtsi
arch/arm/mach-omap2/Kconfig

index cb164dfec56d842eff240351bf77e4dc1932f0d5,78b5e88f869dd3614be1fa5faa10ff3f9a79f521..78088506d25b0e97237cdcdc043e208e152152e4
@@@ -1,5 -1,8 +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 +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 +25,7 @@@
        };
  
        segment@100000 {                                        /* 0x44d00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00100000 0x004000>,      /* ap 4 */
                        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 */
                        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>,
                                        <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>;
  };
  
  &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>;
        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 */
  };
  
  &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>,
                 <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 */
        };
  
        segment@100000 {                                        /* 0x48100000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0008c000 0x0018c000 0x001000>,      /* ap 42 */
        };
  
        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 */
                                        status = "disabled";
                                };
  
 +                              eqep0: counter@180 {
 +                                      compatible = "ti,am3352-eqep";
 +                                      reg = <0x180 0x80>;
 +                                      clocks = <&l4ls_gclk>;
 +                                      clock-names = "sysclkout";
 +                                      interrupts = <79>;
 +                                      status = "disabled";
 +                              };
 +
                                ehrpwm0: pwm@200 {
                                        compatible = "ti,am3352-ehrpwm",
                                                     "ti,am33xx-ehrpwm";
                                        status = "disabled";
                                };
  
 +                              eqep1: counter@180 {
 +                                      compatible = "ti,am3352-eqep";
 +                                      reg = <0x180 0x80>;
 +                                      clocks = <&l4ls_gclk>;
 +                                      clock-names = "sysclkout";
 +                                      interrupts = <88>;
 +                                      status = "disabled";
 +                              };
 +
                                ehrpwm1: pwm@200 {
                                        compatible = "ti,am3352-ehrpwm",
                                                     "ti,am33xx-ehrpwm";
                                        status = "disabled";
                                };
  
 +                              eqep2: counter@180 {
 +                                      compatible = "ti,am3352-eqep";
 +                                      reg = <0x180 0x80>;
 +                                      clocks = <&l4ls_gclk>;
 +                                      clock-names = "sysclkout";
 +                                      interrupts = <89>;
 +                                      status = "disabled";
 +                              };
 +
                                ehrpwm2: pwm@200 {
                                        compatible = "ti,am3352-ehrpwm",
                                                     "ti,am33xx-ehrpwm";
index 8ec3295d5223dc6e61ce892d5b330ba088dd2f6b,dfbededcb2c4eafef4d70e096bf888dc8fa91238..e217ffc0977056272ce00b67f61d941da6b1dfef
@@@ -1,5 -1,8 +1,8 @@@
  &l4_wkup {                                            /* 0x44c00000 */
-       compatible = "ti,am4-l4-wkup", "simple-bus";
+       compatible = "ti,am4-l4-wkup", "simple-pm-bus";
+       power-domains = <&prm_wkup>;
+       clocks = <&l4_wkup_clkctrl AM4_L4_WKUP_L4_WKUP_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x44c00000 0x800>,
              <0x44c00800 0x800>,
              <0x44c01000 0x400>,
@@@ -12,7 -15,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 +25,7 @@@
        };
  
        segment@100000 {                                        /* 0x44d00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00100000 0x004000>,      /* ap 4 */
                         <0x000f0000 0x001f0000 0x010000>;      /* ap 8 */
  
                target-module@0 {                       /* 0x44d00000, ap 4 28.0 */
-                       compatible = "ti,sysc";
-                       status = "disabled";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0x0 0x0 0x4000>;
-               };
-               target-module@80000 {                   /* 0x44d80000, ap 6 10.0 */
-                       compatible = "ti,sysc";
-                       status = "disabled";
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       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 0x80000 0x2000>;
+                       ranges = <0x00000000 0x00000000 0x4000>,
+                                <0x00080000 0x00080000 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 */
@@@ -75,7 -84,7 +84,7 @@@
        };
  
        segment@200000 {                                        /* 0x44e00000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00000000 0x00200000 0x001000>,      /* ap 9 */
                        compatible = "ti,sysc-omap4", "ti,sysc";
                        reg = <0x10000 0x4>;
                        reg-names = "rev";
+                       clocks = <&l4_wkup_clkctrl AM4_L4_WKUP_CONTROL_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0x0 0x10000 0x10000>;
                                        <SYSC_IDLE_SMART>,
                                        <SYSC_IDLE_SMART_WKUP>;
                        /* Domains (P, C): rtc_pwrdm, l4_rtc_clkdm */
+                       power-domains = <&prm_rtc>;
                        clocks = <&l4_rtc_clkctrl AM4_L4_RTC_RTC_CLKCTRL 0>;
                        clock-names = "fck";
                        #address-cells = <1>;
  };
  
  &l4_fast {                                    /* 0x4a000000 */
-       compatible = "ti,am4-l4-fast", "simple-bus";
+       compatible = "ti,am4-l4-fast", "simple-pm-bus";
+       power-domains = <&prm_per>;
+       clocks = <&l3_clkctrl AM4_L3_L4_HS_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x4a000000 0x800>,
              <0x4a000800 0x800>,
              <0x4a001000 0x400>;
        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 */
                        ranges = <0x0 0x100000 0x8000>;
  
                        mac_sw: switch@0 {
 -                              compatible = "ti,am4372-cpsw","ti,cpsw-switch";
 +                              compatible = "ti,am4372-cpsw-switch", "ti,cpsw-switch";
                                reg = <0x0 0x4000>;
                                ranges = <0 0 0x4000>;
                                clocks = <&cpsw_125mhz_gclk>, <&dpll_clksel_mac_clk>;
  };
  
  &l4_per {                                     /* 0x48000000 */
-       compatible = "ti,am4-l4-per", "simple-bus";
+       compatible = "ti,am4-l4-per", "simple-pm-bus";
+       power-domains = <&prm_per>;
+       clocks = <&l4ls_clkctrl AM4_L4LS_L4_LS_CLKCTRL 0>;
+       clock-names = "fck";
        reg = <0x48000000 0x800>,
              <0x48000800 0x800>,
              <0x48001000 0x400>,
                 <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 */
        };
  
        segment@100000 {                                        /* 0x48100000 */
-               compatible = "simple-bus";
+               compatible = "simple-pm-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0008c000 0x0018c000 0x001000>,      /* ap 34 */
        };
  
        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 AM4_MPU_MPU_CLKCTRL 0>;
+                       clock-names = "fck";
+                       ti,no-idle;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0x10000>;
+                       mpu@0 {
+                               compatible = "ti,omap4-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 56 */
                                ranges = <0 0 0x20000>;
  
                                usb1: usb@10000 {
 -                                      compatible = "synopsys,dwc3";
 +                                      compatible = "snps,dwc3";
                                        reg = <0x10000 0x10000>;
                                        interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
                                                     <GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>,
                                ranges = <0 0 0x20000>;
  
                                usb2: usb@10000 {
 -                                      compatible = "synopsys,dwc3";
 +                                      compatible = "snps,dwc3";
                                        reg = <0x10000 0x10000>;
                                        interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
                                                     <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
index 6ba6a1b50e006fbfb4a10a7dbc970a41295e9898,5508a7ff8f89ee750850a2111cf174e082d68834..ce1194744f84025210f5c706e412e10b1267abd0
  
                /* OCP2SCP1 */
                /* IRQ for DWC3_3 and DWC3_4 need IRQ crossbar */
-               gpmc: gpmc@50000000 {
-                       compatible = "ti,am3352-gpmc";
-                       ti,hwmods = "gpmc";
-                       reg = <0x50000000 0x37c>;      /* device IO registers */
-                       interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-                       dmas = <&edma_xbar 4 0>;
-                       dma-names = "rxtx";
-                       gpmc,num-cs = <8>;
-                       gpmc,num-waitpins = <2>;
-                       #address-cells = <2>;
+               target-module@50000000 {
+                       compatible = "ti,sysc-omap2", "ti,sysc";
+                       reg = <0x50000000 4>,
+                             <0x50000010 4>,
+                             <0x50000014 4>;
+                       reg-names = "rev", "sysc", "syss";
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       ti,syss-mask = <1>;
+                       clocks = <&l3main1_clkctrl DRA7_L3MAIN1_GPMC_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
                        #size-cells = <1>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       status = "disabled";
+                       ranges = <0x50000000 0x50000000 0x00001000>, /* regs */
+                                <0x00000000 0x00000000 0x40000000>; /* data */
+                       gpmc: gpmc@50000000 {
+                               compatible = "ti,am3352-gpmc";
+                               reg = <0x50000000 0x37c>;      /* device IO registers */
+                               interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+                               dmas = <&edma_xbar 4 0>;
+                               dma-names = "rxtx";
+                               gpmc,num-cs = <8>;
+                               gpmc,num-waitpins = <2>;
+                               #address-cells = <2>;
+                               #size-cells = <1>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               status = "disabled";
+                       };
                };
  
                target-module@56000000 {
                        };
                };
  
 -              sham_target: target-module@4b101000 {
 +              sham1_target: target-module@4b101000 {
                        compatible = "ti,sysc-omap3-sham", "ti,sysc";
                        reg = <0x4b101100 0x4>,
                              <0x4b101110 0x4>,
                        #size-cells = <1>;
                        ranges = <0x0 0x4b101000 0x1000>;
  
 -                      sham: sham@0 {
 +                      sham1: sham@0 {
                                compatible = "ti,omap5-sham";
                                reg = <0 0x300>;
                                interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
                        };
                };
  
 +              sham2_target: target-module@42701000 {
 +                      compatible = "ti,sysc-omap3-sham", "ti,sysc";
 +                      reg = <0x42701100 0x4>,
 +                            <0x42701110 0x4>,
 +                            <0x42701114 0x4>;
 +                      reg-names = "rev", "sysc", "syss";
 +                      ti,sysc-mask = <(SYSC_OMAP2_SOFTRESET |
 +                                       SYSC_OMAP2_AUTOIDLE)>;
 +                      ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 +                                      <SYSC_IDLE_NO>,
 +                                      <SYSC_IDLE_SMART>;
 +                      ti,syss-mask = <1>;
 +                      /* Domains (P, C): l4per_pwrdm, l4sec_clkdm */
 +                      clocks = <&l4sec_clkctrl DRA7_L4SEC_SHAM2_CLKCTRL 0>;
 +                      clock-names = "fck";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges = <0x0 0x42701000 0x1000>;
 +
 +                      sham2: sham@0 {
 +                              compatible = "ti,omap5-sham";
 +                              reg = <0 0x300>;
 +                              interrupts = <GIC_SPI 163 IRQ_TYPE_LEVEL_HIGH>;
 +                              dmas = <&edma_xbar 165 0>;
 +                              dma-names = "rx";
 +                              clocks = <&l3_iclk_div>;
 +                              clock-names = "fck";
 +                      };
 +              };
 +
+               iva_hd_target: target-module@5a000000 {
+                       compatible = "ti,sysc-omap4", "ti,sysc";
+                       reg = <0x5a05a400 0x4>,
+                             <0x5a05a410 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-midle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>;
+                       power-domains = <&prm_iva>;
+                       resets = <&prm_iva 2>;
+                       reset-names = "rstctrl";
+                       clocks = <&iva_clkctrl DRA7_IVA_CLKCTRL 0>;
+                       clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x5a000000 0x5a000000 0x1000000>,
+                                <0x5b000000 0x5b000000 0x1000000>;
+                       iva {
+                               compatible = "ti,ivahd";
+                       };
+               };
                opp_supply_mpu: opp-supply@4a003b20 {
                        compatible = "ti,omap5-opp-supply";
                        reg = <0x4a003b20 0xc>;
  #include "dra7xx-clocks.dtsi"
  
  &prm {
+       prm_mpu: prm@300 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x300 0x100>;
+               #power-domain-cells = <0>;
+       };
        prm_dsp1: prm@400 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x400 0x100>;
                #reset-cells = <1>;
+               #power-domain-cells = <0>;
        };
  
        prm_ipu: prm@500 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x500 0x100>;
                #reset-cells = <1>;
+               #power-domain-cells = <0>;
+       };
+       prm_coreaon: prm@628 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x628 0xd8>;
+               #power-domain-cells = <0>;
        };
  
        prm_core: prm@700 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x700 0x100>;
                #reset-cells = <1>;
+               #power-domain-cells = <0>;
        };
  
        prm_iva: prm@f00 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0xf00 0x100>;
+               #reset-cells = <1>;
+               #power-domain-cells = <0>;
+       };
+       prm_cam: prm@1000 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1000 0x100>;
+               #power-domain-cells = <0>;
+       };
+       prm_dss: prm@1100 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1100 0x100>;
+               #power-domain-cells = <0>;
+       };
+       prm_gpu: prm@1200 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1200 0x100>;
+               #power-domain-cells = <0>;
+       };
+       prm_l3init: prm@1300 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1300 0x100>;
+               #reset-cells = <1>;
+               #power-domain-cells = <0>;
+       };
+       prm_l4per: prm@1400 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1400 0x100>;
+               #power-domain-cells = <0>;
+       };
+       prm_custefuse: prm@1600 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1600 0x100>;
+               #power-domain-cells = <0>;
+       };
+       prm_wkupaon: prm@1724 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1724 0x100>;
+               #power-domain-cells = <0>;
        };
  
        prm_dsp2: prm@1b00 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x1b00 0x40>;
                #reset-cells = <1>;
+               #power-domain-cells = <0>;
        };
  
        prm_eve1: prm@1b40 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x1b40 0x40>;
+               #power-domain-cells = <0>;
        };
  
        prm_eve2: prm@1b80 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x1b80 0x40>;
+               #power-domain-cells = <0>;
        };
  
        prm_eve3: prm@1bc0 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x1bc0 0x40>;
+               #power-domain-cells = <0>;
        };
  
        prm_eve4: prm@1c00 {
                compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
                reg = <0x1c00 0x60>;
+               #power-domain-cells = <0>;
+       };
+       prm_rtc: prm@1c60 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1c60 0x20>;
+               #power-domain-cells = <0>;
+       };
+       prm_vpe: prm@1c80 {
+               compatible = "ti,dra7-prm-inst", "ti,omap-prm-inst";
+               reg = <0x1c80 0x80>;
+               #power-domain-cells = <0>;
        };
  };
  
index 164985505f9e53266068d969f71973ea2dec4d1e,0c876c0e4d2abd6c34076a389664b40b7f964330..4a59c169a11394a57bd4c52bed23b07ded5ef0cc
@@@ -2,11 -2,15 +2,15 @@@
  menu "TI OMAP/AM/DM/DRA Family"
        depends on ARCH_MULTI_V6 || ARCH_MULTI_V7
  
+ config OMAP_HWMOD
+       bool
  config ARCH_OMAP2
        bool "TI OMAP2"
        depends on ARCH_MULTI_V6
        select ARCH_OMAP2PLUS
        select CPU_V6
+       select OMAP_HWMOD
        select SOC_HAS_OMAP2_SDRC
  
  config ARCH_OMAP3
@@@ -14,6 -18,7 +18,7 @@@
        depends on ARCH_MULTI_V7
        select ARCH_OMAP2PLUS
        select ARM_CPU_SUSPEND if PM
+       select OMAP_HWMOD
        select OMAP_INTERCONNECT
        select PM_OPP if PM
        select PM if CPU_IDLE
@@@ -30,6 -35,7 +35,7 @@@ config ARCH_OMAP
        select ARM_GIC
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
+       select OMAP_HWMOD
        select OMAP_INTERCONNECT
        select OMAP_INTERCONNECT_BARRIER
        select PL310_ERRATA_588369 if CACHE_L2X0
@@@ -49,6 -55,7 +55,7 @@@ config SOC_OMAP
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_ARCH_TIMER
        select ARM_ERRATA_798181 if SMP
+       select OMAP_HWMOD
        select OMAP_INTERCONNECT
        select OMAP_INTERCONNECT_BARRIER
        select PM_OPP if PM
@@@ -84,6 -91,7 +91,7 @@@ config SOC_DRA7X
        select HAVE_ARM_ARCH_TIMER
        select IRQ_CROSSBAR
        select ARM_ERRATA_798181 if SMP
+       select OMAP_HWMOD
        select OMAP_INTERCONNECT
        select OMAP_INTERCONNECT_BARRIER
        select PM_OPP if PM
  config ARCH_OMAP2PLUS
        bool
        select ARCH_HAS_BANDGAP
 -      select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_HAS_RESET_CONTROLLER
        select ARCH_OMAP
        select CLKSRC_MMIO
This page took 0.11768 seconds and 4 git commands to generate.