ARM: shmobile: sh73a0: Enable DT PM domain support
Subsystems (2)
v3 cover ARM: shmobile: sh73a0: Enable DT PM domain support
Hi Simon, Magnus,
This patch series contains the missing pieces to enable DT PM domain support on the Renesas SH-Mobile AG5 (sh73a0) SoC. As a bonus, it also allows the use of the R-Mobile Reset driver to restart the system.
root at kzm9g:~# cat /sys/kernel/debug/pm_genpd/pm_genpd_summary
domain status slaves
/device runtime status
----------------------------------------------------------------------
a2sl on
a3sm on a2sl
a3sg off
a3sp on
/devices/platform/e6820000.i2c suspended
/devices/platform/e6822000.i2c suspended
/devices/platform/e6826000.i2c suspended
/devices/platform/e6c80000.serial active
/devices/platform/ee100000.sd active
/devices/platform/ee140000.sd active
/devices/platform/e6bd0000.mmc active
a4s on a3sp, a3sg, a3sm
/devices/platform/e6900000.irqpin active
/devices/platform/e6900004.irqpin active
/devices/platform/e6900008.irqpin active
/devices/platform/e690000c.irqpin active
/devices/platform/fec10000.bus active
a2rv off
a3r off a2rv
a4rm off a3r
a3vc off
a3mp off
a4mp off a3mp, a3vc
/devices/platform/ec230000.sound suspended
a4lc1 off
a4lc0 off
a4bc1 on
a4bc0 on
d4 off
c4 off
c5 on c4, d4, a4bc0, a4bc1, a4lc0, a4lc1, a4mp, a4rm, a4s /devices/platform/e6050000.pfc unsupported
/devices/platform/e6138000.timer active
root at kzm9g:~#
This depends on the series "[PATCH v4 0/5] ARM: shmobile: sh73a0/kzm9g:
Complete multiplatform support".
Thanks for applying!
Geert Uytterhoeven (2):
ARM: shmobile: sh73a0 dtsi: Add PM domain support
drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd
arch/arm/boot/dts/sh73a0.dtsi | 144 +++++++++++++++++++++++++++++++++++++++++- drivers/sh/pm_runtime.c | 4 +- 2 files changed, 144 insertions(+), 4 deletions(-)
Signature · 12 lines
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsPATCH v3 1/2 ARM: shmobile: sh73a0 dtsi: Add PM domain support
Add a device node for the System Controller, with subnodes that represent the hardware power area hierarchy.
Hook up all devices to their respective PM domains.
Note that unlike on R-Mobile A1 (r8a7740), PM domain D4 can be powered down without ill effects on s2ram behavior, just like on SH-Mobile AP4 (sh7372). Hence we can postpone adding a (minimal) device node for the Coresight-ETM hardware block.
The System Controller is also used by the R-Mobile Reset driver, which can now restart the system.
---
v3:
- Mention the R-Mobile Reset driver,
v2:
- Drop RFC state,
- Extract addition of memory-controller nodes into a separate series,
- Add missing 0x prefix to sysc device node register lengths.
--- arch/arm/boot/dts/sh73a0.dtsi | 144 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 2 deletions(-)
arch/arm/boot/dts/sh73a0.dtsi +142 -2
@@ -27,12 +27,14 @@ compatible = "arm,cortex-a9"; reg = <0>; clock-frequency = <1196000000>; + power-domains = <&pd_a2sl>; }; cpu at 1 { device_type = "cpu"; compatible = "arm,cortex-a9"; reg = <1>; clock-frequency = <1196000000>; + power-domains = <&pd_a2sl>; }; };
@@ -57,6 +59,7 @@ interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>, <0 38 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "sec", "temp"; + power-domains = <&pd_a4bc1>; }; sbsc1: memory-controller at fe400000 {
@@ -65,6 +68,7 @@ interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>, <0 36 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "sec", "temp"; + power-domains = <&pd_a4bc0>; }; pmu {
@@ -77,11 +81,12 @@ compatible = "renesas,cmt-48-sh73a0", "renesas,cmt-48"; reg = <0xe6138000 0x200>; interrupts = <0 65 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks SH73A0_CLK_CMT1>; + clock-names = "fck"; + power-domains = <&pd_c5>; renesas,channels-mask = <0x3f>; - clocks = <&mstp3_clks SH73A0_CLK_CMT1>; - clock-names = "fck"; status = "disabled"; };
@@ -103,6 +108,7 @@ 0 7 IRQ_TYPE_LEVEL_HIGH 0 8 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp5_clks SH73A0_CLK_INTCA0>; + power-domains = <&pd_a4s>; control-parent; };
@@ -124,6 +130,7 @@ 0 15 IRQ_TYPE_LEVEL_HIGH 0 16 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp5_clks SH73A0_CLK_INTCA0>; + power-domains = <&pd_a4s>; control-parent; };
@@ -145,6 +152,7 @@ 0 23 IRQ_TYPE_LEVEL_HIGH 0 24 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp5_clks SH73A0_CLK_INTCA0>; + power-domains = <&pd_a4s>; control-parent; };
@@ -166,6 +174,7 @@ 0 31 IRQ_TYPE_LEVEL_HIGH 0 32 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp5_clks SH73A0_CLK_INTCA0>; + power-domains = <&pd_a4s>; control-parent; };
@@ -179,6 +188,7 @@ 0 169 IRQ_TYPE_LEVEL_HIGH 0 170 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp1_clks SH73A0_CLK_IIC0>; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -192,6 +202,7 @@ 0 53 IRQ_TYPE_LEVEL_HIGH 0 54 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_IIC1>; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -205,6 +216,7 @@ 0 173 IRQ_TYPE_LEVEL_HIGH 0 174 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp0_clks SH73A0_CLK_IIC2>; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -218,6 +230,7 @@ 0 185 IRQ_TYPE_LEVEL_HIGH 0 186 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp4_clks SH73A0_CLK_IIC3>; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -231,6 +244,7 @@ 0 189 IRQ_TYPE_LEVEL_HIGH 0 190 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp4_clks SH73A0_CLK_IIC4>; + power-domains = <&pd_c5>; status = "disabled"; };
@@ -240,6 +254,7 @@ interrupts = <0 140 IRQ_TYPE_LEVEL_HIGH 0 141 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_MMCIF0>; + power-domains = <&pd_a3sp>; reg-io-width = <4>; status = "disabled"; };
@@ -251,6 +266,7 @@ 0 84 IRQ_TYPE_LEVEL_HIGH 0 85 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_SDHI0>; + power-domains = <&pd_a3sp>; cap-sd-highspeed; status = "disabled"; };
@@ -262,6 +278,7 @@ interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH 0 89 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_SDHI1>; + power-domains = <&pd_a3sp>; toshiba,mmc-wrprotect-disable; cap-sd-highspeed; status = "disabled";
@@ -273,6 +290,7 @@ interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH 0 105 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_SDHI2>; + power-domains = <&pd_a3sp>; toshiba,mmc-wrprotect-disable; cap-sd-highspeed; status = "disabled";
@@ -284,6 +302,7 @@ interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA0>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -293,6 +312,7 @@ interrupts = <0 73 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA1>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -302,6 +322,7 @@ interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA2>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -311,6 +332,7 @@ interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA3>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -320,6 +342,7 @@ interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA4>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -329,6 +352,7 @@ interrupts = <0 79 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA5>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -338,6 +362,7 @@ interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks SH73A0_CLK_SCIFA6>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -347,6 +372,7 @@ interrupts = <0 143 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFA7>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -356,6 +382,7 @@ interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks SH73A0_CLK_SCIFB>; clock-names = "sci_ick"; + power-domains = <&pd_a3sp>; status = "disabled"; };
@@ -374,6 +401,117 @@ <&irqpin2 4 0>, <&irqpin2 5 0>, <&irqpin2 6 0>, <&irqpin2 7 0>, <&irqpin3 0 0>, <&irqpin3 1 0>, <&irqpin3 2 0>, <&irqpin3 3 0>, <&irqpin3 4 0>, <&irqpin3 5 0>, <&irqpin3 6 0>, <&irqpin3 7 0>; + power-domains = <&pd_c5>; + }; + + sysc: system-controller at e6180000 { + compatible = "renesas,sysc-sh73a0", "renesas,sysc-rmobile"; + reg = <0xe6180000 0x8000>, <0xe6188000 0x8000>; + + pm-domains { + pd_c5: c5 { + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_c4: c4 at 0 { + reg = <0>; + #power-domain-cells = <0>; + }; + + pd_d4: d4 at 1 { + reg = <1>; + #power-domain-cells = <0>; + }; + + pd_a4bc0: a4bc0 at 4 { + reg = <4>; + #power-domain-cells = <0>; + }; + + pd_a4bc1: a4bc1 at 5 { + reg = <5>; + #power-domain-cells = <0>; + }; + + pd_a4lc0: a4lc0 at 6 { + reg = <6>; + #power-domain-cells = <0>; + }; + + pd_a4lc1: a4lc1 at 7 { + reg = <7>; + #power-domain-cells = <0>; + }; + + pd_a4mp: a4mp at 8 { + reg = <8>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_a3mp: a3mp at 9 { + reg = <9>; + #power-domain-cells = <0>; + }; + + pd_a3vc: a3vc at 10 { + reg = <10>; + #power-domain-cells = <0>; + }; + }; + + pd_a4rm: a4rm at 12 { + reg = <12>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_a3r: a3r at 13 { + reg = <13>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_a2rv: a2rv at 14 { + reg = <14>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + }; + }; + }; + + pd_a4s: a4s at 16 { + reg = <16>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_a3sp: a3sp at 17 { + reg = <17>; + #power-domain-cells = <0>; + }; + + pd_a3sg: a3sg at 18 { + reg = <18>; + #power-domain-cells = <0>; + }; + + pd_a3sm: a3sm at 19 { + reg = <19>; + #address-cells = <1>; + #size-cells = <0>; + #power-domain-cells = <0>; + + pd_a2sl: a2sl at 20 { + reg = <20>; + #power-domain-cells = <0>; + }; + }; + }; + }; + }; }; sh_fsi2: sound at ec230000 {
@@ -381,6 +519,7 @@ compatible = "renesas,fsi2-sh73a0", "renesas,sh_fsi2"; reg = <0xec230000 0x400>; interrupts = <0 146 0x4>; + power-domains = <&pd_a4mp>; status = "disabled"; };
@@ -393,6 +532,7 @@ reg = <0xfec10000 0x400>; interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>; clocks = <&zb_clk>; + power-domains = <&pd_a4s>; }; clocks {
Signature · 1 line
1.9.1
PATCH v3 2/2 drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd
In reply to Geert UytterhoevenIf the default PM domain using PM_CLK is used for PM runtime, the real PM domain(s) cannot be registered from DT later.
Hence do not enable it when running a multi-platform kernel with genpd support on an sh73a0. The R-Mobile PM domain driver will take care of PM runtime management of the module clocks.
The default PM domain is still needed for:
- platforms without genpd support,
- the legacy (non-DT) case, where genpd may take over later, except for the C5 "always on" PM domain.
---
v3:
- No changes,
v2:
- No changes.
--- drivers/sh/pm_runtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/sh/pm_runtime.c +2 -2
@@ -83,6 +83,7 @@ static int __init sh_pm_runtime_init(void) !of_machine_is_compatible("renesas,r8a73a4") && #ifndef CONFIG_PM_GENERIC_DOMAINS_OF !of_machine_is_compatible("renesas,r8a7740") && + !of_machine_is_compatible("renesas,sh73a0") && #endif !of_machine_is_compatible("renesas,r8a7778") && !of_machine_is_compatible("renesas,r8a7779") &&
@@ -91,8 +92,7 @@ static int __init sh_pm_runtime_init(void) !of_machine_is_compatible ("renesas,r8a7792" ) && !of_machine_is_compatible ("renesas,r8a7793" ) && !of_machine_is_compatible ("renesas,r8a7794" ) && - !of_machine_is_compatible ("renesas,sh7372" ) && - !of_machine_is_compatible("renesas,sh73a0")) + !of_machine_is_compatible("renesas,sh7372")) return 0; }
Signature · 1 line
1.9.1
v3 cover ARM: shmobile: sh73a0: Enable DT PM domain support
In reply to Geert UytterhoevenQuoted 41 lines · Geert Uytterhoeven
Hi Simon, Magnus,
This patch series contains the missing pieces to enable DT PM domain support on the Renesas SH-Mobile AG5 (sh73a0) SoC. As a bonus, it also allows the use of the R-Mobile Reset driver to restart the system.
root at kzm9g:~# cat
/sys/kernel/debug/pm_genpd/pm_genpd_summary
domain status slaves
/device runtime status
----------------------------------------------------------------------a2sl on a3sm on a2sl a3sg off a3sp on /devices/platform/e6820000.i2c suspended /devices/platform/e6822000.i2c suspended /devices/platform/e6826000.i2c suspended /devices/platform/e6c80000.serial active /devices/platform/ee100000.sd active /devices/platform/ee140000.sd active /devices/platform/e6bd0000.mmc active a4s on a3sp, a3sg, a3sm /devices/platform/e6900000.irqpin active /devices/platform/e6900004.irqpin active /devices/platform/e6900008.irqpin active /devices/platform/e690000c.irqpin active /devices/platform/fec10000.bus active a2rv off a3r off a2rv a4rm off a3r a3vc off a3mp off a4mp off a3mp, a3vc /devices/platform/ec230000.sound suspended a4lc1 off a4lc0 off a4bc1 on a4bc0 on d4 off c4 off c5 on c4, d4, a4bc0, a4bc1, a4lc0, a4lc1, a4mp, a4rm, a4s
Quoted 8 lines
/devices/platform/e6050000.pfc unsupported
/devices/platform/e6138000.timer active
root at kzm9g:~#This depends on the series "[PATCH v4 0/5] ARM: shmobile: sh73a0/kzm9g:
Complete multiplatform support".Thanks for applying!
Thanks, done.