* [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S " Simon Horman
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 802a5639aa7041b2 ("ARM: shmobile: r8a7740: add A3SP pm domain
support") added the A3SP power domain, but forgot to hook up the IPPMU,
DMAC0/1/2, and USBDMAC hardware blocks.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 8894e1b..6992d40 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -756,6 +756,11 @@ void __init r8a7740_add_standard_devices(void)
{ "A3SP", &scif7_device },
{ "A3SP", &scif8_device },
{ "A3SP", &i2c1_device },
+ { "A3SP", &ipmmu_device },
+ { "A3SP", &dma0_device },
+ { "A3SP", &dma1_device },
+ { "A3SP", &dma2_device },
+ { "A3SP", &usb_dma_device },
};
/* I2C work-around */
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S pm domain devices
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
2014-11-04 1:49 ` [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 03/11] ARM: shmobile: armadillo800eva legacy: Add missing A3SP " Simon Horman
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 8459293c27bcd13a ("ARM: shmobile: r8a7740: add A4S pm domain
support") added the A4S power domain, but forgot to hook up the INTCA
hardware block.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7740.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 6992d40..dbf8a93 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -746,6 +746,10 @@ static void r8a7740_i2c_workaround(struct platform_device *pdev)
void __init r8a7740_add_standard_devices(void)
{
static struct pm_domain_device domain_devices[] __initdata = {
+ { "A4S", &irqpin0_device },
+ { "A4S", &irqpin1_device },
+ { "A4S", &irqpin2_device },
+ { "A4S", &irqpin3_device },
{ "A3SP", &scif0_device },
{ "A3SP", &scif1_device },
{ "A3SP", &scif2_device },
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm domain devices
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
2014-11-04 1:49 ` [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices Simon Horman
2014-11-04 1:49 ` [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S " Simon Horman
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 802a5639aa7041b2 ("ARM: shmobile: r8a7740: add A3SP pm domain
support") added the A3SP power domain, but forgot to hook up the TPU,
SDHI0/1, and MMCIF hardware blocks.
Note: As the default PM QoS latency constraint for SDHI is only 100 ?s
(cfr. commit c419e611c3c59c0e ("tmio_mmc / PM: Use PM QoS latency
constraint"), while DEFAULT_DEV_LATENCY_NS is 250000, suspend fails with
-EBUSY, unless the constraint is increased first to more than 500 ?s
using e.g.
echo 501 > /sys/devices/platform/sh_mobile_sdhi.0/power/pm_qos_resume_latency_us
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index e709835..4bc202d 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1234,8 +1234,11 @@ static void __init eva_init(void)
static struct pm_domain_device domain_devices[] __initdata = {
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_device },
+ { "A3SP", &pwm_device },
+ { "A3SP", &sdhi0_device },
+ { "A3SP", &sh_mmcif_device },
};
- struct platform_device *usb = NULL;
+ struct platform_device *usb = NULL, *sdhi1 = NULL;
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
@@ -1304,6 +1307,7 @@ static void __init eva_init(void)
platform_device_register(&vcc_sdhi1);
platform_device_register(&sdhi1_device);
+ sdhi1 = &sdhi1_device;
}
@@ -1324,6 +1328,8 @@ static void __init eva_init(void)
ARRAY_SIZE(domain_devices));
if (usb)
rmobile_add_device_to_domain("A3SP", usb);
+ if (sdhi1)
+ rmobile_add_device_to_domain("A3SP", sdhi1);
r8a7740_pm_init();
}
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain devices
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (2 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 03/11] ARM: shmobile: armadillo800eva legacy: Add missing A3SP " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support Simon Horman
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Commit 8459293c27bcd13a ("ARM: shmobile: r8a7740: add A4S pm domain
support") added the A4S power domain, but forgot to hook up the GbEther
hardware block.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 4bc202d..0aa5bbd 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1234,6 +1234,7 @@ static void __init eva_init(void)
static struct pm_domain_device domain_devices[] __initdata = {
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_device },
+ { "A4S", &sh_eth_device },
{ "A3SP", &pwm_device },
{ "A3SP", &sdhi0_device },
{ "A3SP", &sh_mmcif_device },
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (3 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG " Simon Horman
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A3RV power domain.
This domain contains the VPU5F and VCP1 hardware blocks, which are
currently not used by any driver.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index e3f1464..1d91603 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -37,6 +37,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.genpd.name = "A4LC",
.bit_shift = 1,
}, {
+ .genpd.name = "A3RV",
+ .bit_shift = 6,
+ }, {
.genpd.name = "A4S",
.bit_shift = 10,
.gov = &pm_domain_always_on_gov,
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (4 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 07/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP " Simon Horman
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A3SG power domain, and hook it up as a subdomain of
A4S.
This domain contains the SGX540 hardware block, which is currently not
used by any driver.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 1d91603..932c2a6 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -51,6 +51,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.gov = &pm_domain_always_on_gov,
.no_debug = true,
.suspend = r8a7740_pd_a3sp_suspend,
+ }, {
+ .genpd.name = "A3SG",
+ .bit_shift = 13,
},
};
@@ -58,6 +61,7 @@ void __init r8a7740_init_pm_domains(void)
{
rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
pm_genpd_add_subdomain_names("A4S", "A3SP");
+ pm_genpd_add_subdomain_names("A4S", "A3SG");
}
#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (5 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 08/11] ARM: shmobile: r8a7740: Add D4 " Simon Horman
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A4MP power domain, and hook up the HDMI-Link and FSI
hardware blocks.
This domain also contains the SPU2, FMSI, and BBIF2 hardware blocks,
but these are currently not used by any driver.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 2 ++
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 0aa5bbd..e064443 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1234,6 +1234,8 @@ static void __init eva_init(void)
static struct pm_domain_device domain_devices[] __initdata = {
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_device },
+ { "A4MP", &hdmi_device },
+ { "A4MP", &fsi_device },
{ "A4S", &sh_eth_device },
{ "A3SP", &pwm_device },
{ "A3SP", &sdhi0_device },
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 932c2a6..081a4f9 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -37,6 +37,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.genpd.name = "A4LC",
.bit_shift = 1,
}, {
+ .genpd.name = "A4MP",
+ .bit_shift = 2,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/11] ARM: shmobile: r8a7740: Add D4 pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (6 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 07/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R " Simon Horman
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the D4 power domain.
This domain contains the Coresight-ETM hardware block.
As long as the ARM debug/perf code doesn't use resource management with
runtime PM support, the D4 power domain must be kept powered to avoid a
crash during resume from s2ram (dbg_cpu_pm_notify() calls
reset_ctrl_regs() unconditionally, causing an undefined instruction
oops).
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 081a4f9..8b1af2a 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -32,6 +32,16 @@ static int r8a7740_pd_a3sp_suspend(void)
return console_suspend_enabled ? 0 : -EBUSY;
}
+static int r8a7740_pd_d4_suspend(void)
+{
+ /*
+ * The D4 domain contains the Coresight-ETM hardware block and
+ * therefore it should only be turned off if the debug module is
+ * not in use.
+ */
+ return -EBUSY;
+}
+
static struct rmobile_pm_domain r8a7740_pm_domains[] = {
{
.genpd.name = "A4LC",
@@ -40,6 +50,11 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.genpd.name = "A4MP",
.bit_shift = 2,
}, {
+ .genpd.name = "D4",
+ .bit_shift = 3,
+ .gov = &pm_domain_always_on_gov,
+ .suspend = r8a7740_pd_d4_suspend,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (7 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 08/11] ARM: shmobile: r8a7740: Add D4 " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 10/11] ARM: shmobile: r8a7740: Add A4SU " Simon Horman
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A4R power domain, and hook up the A3RV subdomain,
and the CEU0, TMU0, and IIC0 hardware blocks.
This domain also contains the Realtime CPU (SH-4A), Realtime CPU debug
modules, H-UDI, RT-SHwy, INTCS, RT-HPB, VIO6C, JPU, RTDMAC1/2, SSP,
MSIOF0, CMT0, ICB, DREQPAK (RT), 2DDMAC, IPMMUI, and 2DG hardware
blocks, but these are currently not used by any driver.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
arch/arm/mach-shmobile/pm-r8a7740.c | 4 ++++
arch/arm/mach-shmobile/setup-r8a7740.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index e064443..25813da 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1236,6 +1236,7 @@ static void __init eva_init(void)
{ "A4LC", &hdmi_lcdc_device },
{ "A4MP", &hdmi_device },
{ "A4MP", &fsi_device },
+ { "A4R", &ceu0_device },
{ "A4S", &sh_eth_device },
{ "A3SP", &pwm_device },
{ "A3SP", &sdhi0_device },
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 8b1af2a..74e6a67 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -55,6 +55,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.gov = &pm_domain_always_on_gov,
.suspend = r8a7740_pd_d4_suspend,
}, {
+ .genpd.name = "A4R",
+ .bit_shift = 5,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
@@ -78,6 +81,7 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
void __init r8a7740_init_pm_domains(void)
{
rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
+ pm_genpd_add_subdomain_names("A4R", "A3RV");
pm_genpd_add_subdomain_names("A4S", "A3SP");
pm_genpd_add_subdomain_names("A4S", "A3SG");
}
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index dbf8a93..b77c226 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -746,6 +746,8 @@ static void r8a7740_i2c_workaround(struct platform_device *pdev)
void __init r8a7740_add_standard_devices(void)
{
static struct pm_domain_device domain_devices[] __initdata = {
+ { "A4R", &tmu0_device },
+ { "A4R", &i2c0_device },
{ "A4S", &irqpin0_device },
{ "A4S", &irqpin1_device },
{ "A4S", &irqpin2_device },
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] ARM: shmobile: r8a7740: Add A4SU pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (8 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-04 1:49 ` [PATCH 11/11] ARM: shmobile: r8a7740: Add A3SM " Simon Horman
2014-11-19 21:02 ` [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Arnd Bergmann
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A4SU power domain.
This domain contains the USBPHY hardware block, which is currently not
used by any driver.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 74e6a67..27117a8 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -75,6 +75,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
}, {
.genpd.name = "A3SG",
.bit_shift = 13,
+ }, {
+ .genpd.name = "A4SU",
+ .bit_shift = 20,
},
};
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] ARM: shmobile: r8a7740: Add A3SM pm domain support
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (9 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 10/11] ARM: shmobile: r8a7740: Add A4SU " Simon Horman
@ 2014-11-04 1:49 ` Simon Horman
2014-11-19 21:02 ` [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Arnd Bergmann
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-11-04 1:49 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add support for the A3SM power domain, and hook it up as a subdomain of
A4S.
This domain contains the System CPU (Cortex-A9) hardware block. Hence
move the special CPU handling from A4S to A3SM.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index 27117a8..ac2eecd 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -14,10 +14,10 @@
#include "pm-rmobile.h"
#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
-static int r8a7740_pd_a4s_suspend(void)
+static int r8a7740_pd_a3sm_suspend(void)
{
/*
- * The A4S domain contains the CPU core and therefore it should
+ * The A3SM domain contains the CPU core and therefore it should
* only be turned off if the CPU is not in use.
*/
return -EBUSY;
@@ -63,9 +63,7 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
}, {
.genpd.name = "A4S",
.bit_shift = 10,
- .gov = &pm_domain_always_on_gov,
.no_debug = true,
- .suspend = r8a7740_pd_a4s_suspend,
}, {
.genpd.name = "A3SP",
.bit_shift = 11,
@@ -73,6 +71,11 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
.no_debug = true,
.suspend = r8a7740_pd_a3sp_suspend,
}, {
+ .genpd.name = "A3SM",
+ .bit_shift = 12,
+ .gov = &pm_domain_always_on_gov,
+ .suspend = r8a7740_pd_a3sm_suspend,
+ }, {
.genpd.name = "A3SG",
.bit_shift = 13,
}, {
@@ -86,6 +89,7 @@ void __init r8a7740_init_pm_domains(void)
rmobile_init_domains(r8a7740_pm_domains, ARRAY_SIZE(r8a7740_pm_domains));
pm_genpd_add_subdomain_names("A4R", "A3RV");
pm_genpd_add_subdomain_names("A4S", "A3SP");
+ pm_genpd_add_subdomain_names("A4S", "A3SM");
pm_genpd_add_subdomain_names("A4S", "A3SG");
}
#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
--
2.1.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19
2014-11-04 1:49 [GIT PULL] Renesas ARM Based SoC Runtime PM Updates for v3.19 Simon Horman
` (10 preceding siblings ...)
2014-11-04 1:49 ` [PATCH 11/11] ARM: shmobile: r8a7740: Add A3SM " Simon Horman
@ 2014-11-19 21:02 ` Arnd Bergmann
11 siblings, 0 replies; 13+ messages in thread
From: Arnd Bergmann @ 2014-11-19 21:02 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 04 November 2014, Simon Horman wrote:
> Please consider these Renesas ARM based SoC runtime PM updates for v3.19.
>
>
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
>
> Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-runtime-pm-for-v3.19
>
> for you to fetch changes up to dc4470e177973feedd82596969d86468a1695b1e:
>
> ARM: shmobile: r8a7740: Add A3SM pm domain support (2014-10-28 08:40:18 +0900)
Pulled into soc branch now, sorry for the delay.
Arnd
^ permalink raw reply [flat|nested] 13+ messages in thread