* [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Magnus,
This series contains prototype patches to improve pm domain support for
r8a7740/armadillo800eva, mimicking (parts of) the existing pm domain support
for sh7372/mackerel.
More specifically, they
- Add missing devices to existing pm domains,
- Add missing pm domains, hooking up devices and subdomains,
There are a few things commented out, and a few rough edges or missing things
(cfr. the patches marked with "[WIP]", and the "FIXME" sections therein),
but the result does boot, and s2ram works.
Please note that DT/multi-platform support will be added later.
This series depends on my series "[PATCH 0/5] ARM: shmobile: pm domain
improvements and cleanups".
Thanks for your comments and suggestions!
Geert Uytterhoeven (11):
ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
ARM: shmobile: r8a7740: Add missing A4S pm domain devices
[WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm
domain devices
ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain
devices
ARM: shmobile: r8a7740: Add A3RV pm domain support
ARM: shmobile: r8a7740: Add A3SG pm domain support
[WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain
support
[WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
[WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
[WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++++++-
arch/arm/mach-shmobile/pm-r8a7740.c | 25 ++++++++++++++++++++++++
arch/arm/mach-shmobile/setup-r8a7740.c | 11 +++++++++++
3 files changed, 46 insertions(+), 1 deletion(-)
--
1.7.9.5
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 Torvalds
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
Hi Simon, Magnus,
This series contains prototype patches to improve pm domain support for
r8a7740/armadillo800eva, mimicking (parts of) the existing pm domain support
for sh7372/mackerel.
More specifically, they
- Add missing devices to existing pm domains,
- Add missing pm domains, hooking up devices and subdomains,
There are a few things commented out, and a few rough edges or missing things
(cfr. the patches marked with "[WIP]", and the "FIXME" sections therein),
but the result does boot, and s2ram works.
Please note that DT/multi-platform support will be added later.
This series depends on my series "[PATCH 0/5] ARM: shmobile: pm domain
improvements and cleanups".
Thanks for your comments and suggestions!
Geert Uytterhoeven (11):
ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
ARM: shmobile: r8a7740: Add missing A4S pm domain devices
[WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm
domain devices
ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain
devices
ARM: shmobile: r8a7740: Add A3RV pm domain support
ARM: shmobile: r8a7740: Add A3SG pm domain support
[WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain
support
[WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
[WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
[WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++++++-
arch/arm/mach-shmobile/pm-r8a7740.c | 25 ++++++++++++++++++++++++
arch/arm/mach-shmobile/setup-r8a7740.c | 11 +++++++++++
3 files changed, 46 insertions(+), 1 deletion(-)
--
1.7.9.5
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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 Torvalds
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 8894e1b7ab0e..6992d4013ef0 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 8894e1b7ab0e..6992d4013ef0 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 01/11] ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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>
---
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 8894e1b7ab0e..6992d4013ef0 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S pm domain devices
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 6992d4013ef0..dbf8a93ccc4f 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 6992d4013ef0..dbf8a93ccc4f 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 02/11] ARM: shmobile: r8a7740: Add missing A4S pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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>
---
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 6992d4013ef0..dbf8a93ccc4f 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm domain devices
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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.
FIXME: 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>
---
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 f19459a8c3ed..64a68450c28a 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();
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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.
FIXME: 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>
---
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 f19459a8c3ed..64a68450c28a 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();
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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.
FIXME: 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>
---
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 f19459a8c3ed..64a68450c28a 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();
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain devices
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 64a68450c28a..735036038951 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 64a68450c28a..735036038951 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 04/11] ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain devices
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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>
---
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 64a68450c28a..735036038951 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 b20dd5b37e6d..93a89329d927 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,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 b20dd5b37e6d..93a89329d927 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,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 05/11] ARM: shmobile: r8a7740: Add A3RV pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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>
---
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 b20dd5b37e6d..93a89329d927 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,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 93a89329d927..84b94d1d96db 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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 93a89329d927..84b94d1d96db 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 06/11] ARM: shmobile: r8a7740: Add A3SG pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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>
---
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 93a89329d927..84b94d1d96db 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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 07/11] [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the A4MP power domain, and hook up the FSI hardware block.
This domain also contains the SPU2, FMSI, and BBIF2 hardware blocks,
but these are currently not used by any driver.
FIXME: A4PM is not added, as it causes "irq 163: nobody cared" (irq 163
is registered by sh-mobile-hdmi), either on boot, or, when trying
to fix it using pm_domain_always_on_gov, on resume.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 735036038951..c2ac4ee51710 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 },
+ { "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 84b94d1d96db..86b2df8b5391 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,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 07/11] [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the A4MP power domain, and hook up the FSI hardware block.
This domain also contains the SPU2, FMSI, and BBIF2 hardware blocks,
but these are currently not used by any driver.
FIXME: A4PM is not added, as it causes "irq 163: nobody cared" (irq 163
is registered by sh-mobile-hdmi), either on boot, or, when trying
to fix it using pm_domain_always_on_gov, on resume.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 735036038951..c2ac4ee51710 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 },
+ { "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 84b94d1d96db..86b2df8b5391 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,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 07/11] [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
Add support for the A4MP power domain, and hook up the FSI hardware block.
This domain also contains the SPU2, FMSI, and BBIF2 hardware blocks,
but these are currently not used by any driver.
FIXME: A4PM is not added, as it causes "irq 163: nobody cared" (irq 163
is registered by sh-mobile-hdmi), either on boot, or, when trying
to fix it using pm_domain_always_on_gov, on resume.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
arch/arm/mach-shmobile/pm-r8a7740.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 735036038951..c2ac4ee51710 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 },
+ { "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 84b94d1d96db..86b2df8b5391 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,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 08/11] [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the D4 power domain.
This domain contains the Coresight-ETM hardware block.
FIXME: D4 is not added, as this breaks resume (dbg_cpu_pm_notify() calls
reset_ctrl_regs(), which crashes as D4 is powered down, and commit
0d352e3d006c9589 ("ARM: hw_breakpoint: trap undef instruction
exceptions in reset_ctrl_regs") doesn't seem to work...)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 86b2df8b5391..cbdb87c67711 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -40,6 +40,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "A4MP",
// .bit_shift = 2,
// }, {
+// .genpd.name = "D4",
+// .bit_shift = 3,
+// }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 08/11] [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the D4 power domain.
This domain contains the Coresight-ETM hardware block.
FIXME: D4 is not added, as this breaks resume (dbg_cpu_pm_notify() calls
reset_ctrl_regs(), which crashes as D4 is powered down, and commit
0d352e3d006c9589 ("ARM: hw_breakpoint: trap undef instruction
exceptions in reset_ctrl_regs") doesn't seem to work...)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 86b2df8b5391..cbdb87c67711 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -40,6 +40,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "A4MP",
// .bit_shift = 2,
// }, {
+// .genpd.name = "D4",
+// .bit_shift = 3,
+// }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 08/11] [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
Add support for the D4 power domain.
This domain contains the Coresight-ETM hardware block.
FIXME: D4 is not added, as this breaks resume (dbg_cpu_pm_notify() calls
reset_ctrl_regs(), which crashes as D4 is powered down, and commit
0d352e3d006c9589 ("ARM: hw_breakpoint: trap undef instruction
exceptions in reset_ctrl_regs") doesn't seem to work...)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 86b2df8b5391..cbdb87c67711 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -40,6 +40,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "A4MP",
// .bit_shift = 2,
// }, {
+// .genpd.name = "D4",
+// .bit_shift = 3,
+// }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 c2ac4ee51710..20967dbbc1c9 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1235,6 +1235,7 @@ static void __init eva_init(void)
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_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 cbdb87c67711..3e15143572dc 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -43,6 +43,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "D4",
// .bit_shift = 3,
// }, {
+ .genpd.name = "A4R",
+ .bit_shift = 5,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
@@ -66,6 +69,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 dbf8a93ccc4f..b77c226ab891 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 c2ac4ee51710..20967dbbc1c9 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1235,6 +1235,7 @@ static void __init eva_init(void)
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_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 cbdb87c67711..3e15143572dc 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -43,6 +43,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "D4",
// .bit_shift = 3,
// }, {
+ .genpd.name = "A4R",
+ .bit_shift = 5,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
@@ -66,6 +69,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 dbf8a93ccc4f..b77c226ab891 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 09/11] ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 c2ac4ee51710..20967dbbc1c9 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1235,6 +1235,7 @@ static void __init eva_init(void)
{ "A4LC", &lcdc0_device },
{ "A4LC", &hdmi_lcdc_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 cbdb87c67711..3e15143572dc 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -43,6 +43,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
// .genpd.name = "D4",
// .bit_shift = 3,
// }, {
+ .genpd.name = "A4R",
+ .bit_shift = 5,
+ }, {
.genpd.name = "A3RV",
.bit_shift = 6,
}, {
@@ -66,6 +69,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 dbf8a93ccc4f..b77c226ab891 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 },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the A4SU power domain.
This domain contains the USBPHY hardware block, which is currently not
used by any driver.
FIXME: Somehow this should be tied to USBH (or USBF) in A3SP?
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 3e15143572dc..d563e623bcb5 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -63,6 +63,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
}, {
.genpd.name = "A3SG",
.bit_shift = 13,
+ }, {
+ .genpd.name = "A4SU",
+ .bit_shift = 20,
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
Add support for the A4SU power domain.
This domain contains the USBPHY hardware block, which is currently not
used by any driver.
FIXME: Somehow this should be tied to USBH (or USBF) in A3SP?
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 3e15143572dc..d563e623bcb5 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -63,6 +63,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
}, {
.genpd.name = "A3SG",
.bit_shift = 13,
+ }, {
+ .genpd.name = "A4SU",
+ .bit_shift = 20,
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
Add support for the A4SU power domain.
This domain contains the USBPHY hardware block, which is currently not
used by any driver.
FIXME: Somehow this should be tied to USBH (or USBF) in A3SP?
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
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 3e15143572dc..d563e623bcb5 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -63,6 +63,9 @@ static struct rmobile_pm_domain r8a7740_pm_domains[] = {
}, {
.genpd.name = "A3SG",
.bit_shift = 13,
+ }, {
+ .genpd.name = "A4SU",
+ .bit_shift = 20,
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* [PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-08-29 13:50 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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, and thus
must be controlled by the always-on governor.
FIXME: A3SM is never powered down during s2ram, even when adding a
.suspend method like A4S has.
As A3SM is a subdomain of A4S, A4S is no longer powered down
during s2ram.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index d563e623bcb5..23254c31efd9 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -61,6 +61,10 @@ 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,
+ }, {
.genpd.name = "A3SG",
.bit_shift = 13,
}, {
@@ -74,6 +78,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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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, and thus
must be controlled by the always-on governor.
FIXME: A3SM is never powered down during s2ram, even when adding a
.suspend method like A4S has.
As A3SM is a subdomain of A4S, A4S is no longer powered down
during s2ram.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index d563e623bcb5..23254c31efd9 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -61,6 +61,10 @@ 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,
+ }, {
.genpd.name = "A3SG",
.bit_shift = 13,
}, {
@@ -74,6 +78,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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
@ 2014-08-29 13:50 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-08-29 13:50 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel,
Geert Uytterhoeven
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, and thus
must be controlled by the always-on governor.
FIXME: A3SM is never powered down during s2ram, even when adding a
.suspend method like A4S has.
As A3SM is a subdomain of A4S, A4S is no longer powered down
during s2ram.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/pm-r8a7740.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index d563e623bcb5..23254c31efd9 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -61,6 +61,10 @@ 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,
+ }, {
.genpd.name = "A3SG",
.bit_shift = 13,
}, {
@@ -74,6 +78,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 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 45+ messages in thread
* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
2014-08-29 13:50 ` Geert Uytterhoeven
(?)
@ 2014-09-09 2:26 ` Simon Horman
-1 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-09 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Geert,
I would like Magnus's opinion but mine is that the non-WIP patches
could be queued up. At least patch 1 and 2. Possibly others if
they don't depend (other than diff noise) on WIP patches.
With the WIP patches, I am not entirely opposed to merging them
too, so long as they move things in a good direction. And in particular
don't break anything.
On Fri, Aug 29, 2014 at 03:50:06PM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> This series contains prototype patches to improve pm domain support for
> r8a7740/armadillo800eva, mimicking (parts of) the existing pm domain support
> for sh7372/mackerel.
>
> More specifically, they
> - Add missing devices to existing pm domains,
> - Add missing pm domains, hooking up devices and subdomains,
>
> There are a few things commented out, and a few rough edges or missing things
> (cfr. the patches marked with "[WIP]", and the "FIXME" sections therein),
> but the result does boot, and s2ram works.
>
> Please note that DT/multi-platform support will be added later.
>
> This series depends on my series "[PATCH 0/5] ARM: shmobile: pm domain
> improvements and cleanups".
>
> Thanks for your comments and suggestions!
>
> Geert Uytterhoeven (11):
> ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
> ARM: shmobile: r8a7740: Add missing A4S pm domain devices
> [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm
> domain devices
> ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain
> devices
> ARM: shmobile: r8a7740: Add A3RV pm domain support
> ARM: shmobile: r8a7740: Add A3SG pm domain support
> [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain
> support
> [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
> ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++++++-
> arch/arm/mach-shmobile/pm-r8a7740.c | 25 ++++++++++++++++++++++++
> arch/arm/mach-shmobile/setup-r8a7740.c | 11 +++++++++++
> 3 files changed, 46 insertions(+), 1 deletion(-)
>
> --
> 1.7.9.5
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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 Torvalds
>
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-09 2:26 ` Simon Horman
0 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-09 2:26 UTC (permalink / raw)
To: linux-arm-kernel
Hi Geert,
I would like Magnus's opinion but mine is that the non-WIP patches
could be queued up. At least patch 1 and 2. Possibly others if
they don't depend (other than diff noise) on WIP patches.
With the WIP patches, I am not entirely opposed to merging them
too, so long as they move things in a good direction. And in particular
don't break anything.
On Fri, Aug 29, 2014 at 03:50:06PM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> This series contains prototype patches to improve pm domain support for
> r8a7740/armadillo800eva, mimicking (parts of) the existing pm domain support
> for sh7372/mackerel.
>
> More specifically, they
> - Add missing devices to existing pm domains,
> - Add missing pm domains, hooking up devices and subdomains,
>
> There are a few things commented out, and a few rough edges or missing things
> (cfr. the patches marked with "[WIP]", and the "FIXME" sections therein),
> but the result does boot, and s2ram works.
>
> Please note that DT/multi-platform support will be added later.
>
> This series depends on my series "[PATCH 0/5] ARM: shmobile: pm domain
> improvements and cleanups".
>
> Thanks for your comments and suggestions!
>
> Geert Uytterhoeven (11):
> ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
> ARM: shmobile: r8a7740: Add missing A4S pm domain devices
> [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm
> domain devices
> ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain
> devices
> ARM: shmobile: r8a7740: Add A3RV pm domain support
> ARM: shmobile: r8a7740: Add A3SG pm domain support
> [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain
> support
> [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
> ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++++++-
> arch/arm/mach-shmobile/pm-r8a7740.c | 25 ++++++++++++++++++++++++
> arch/arm/mach-shmobile/setup-r8a7740.c | 11 +++++++++++
> 3 files changed, 46 insertions(+), 1 deletion(-)
>
> --
> 1.7.9.5
>
> 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 Torvalds
>
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-09 2:26 ` Simon Horman
0 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-09 2:26 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Magnus Damm, Rafael J. Wysocki, linux-sh, linux-pm, linux-arm-kernel
Hi Geert,
I would like Magnus's opinion but mine is that the non-WIP patches
could be queued up. At least patch 1 and 2. Possibly others if
they don't depend (other than diff noise) on WIP patches.
With the WIP patches, I am not entirely opposed to merging them
too, so long as they move things in a good direction. And in particular
don't break anything.
On Fri, Aug 29, 2014 at 03:50:06PM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> This series contains prototype patches to improve pm domain support for
> r8a7740/armadillo800eva, mimicking (parts of) the existing pm domain support
> for sh7372/mackerel.
>
> More specifically, they
> - Add missing devices to existing pm domains,
> - Add missing pm domains, hooking up devices and subdomains,
>
> There are a few things commented out, and a few rough edges or missing things
> (cfr. the patches marked with "[WIP]", and the "FIXME" sections therein),
> but the result does boot, and s2ram works.
>
> Please note that DT/multi-platform support will be added later.
>
> This series depends on my series "[PATCH 0/5] ARM: shmobile: pm domain
> improvements and cleanups".
>
> Thanks for your comments and suggestions!
>
> Geert Uytterhoeven (11):
> ARM: shmobile: r8a7740: Add missing A3SP pm domain devices
> ARM: shmobile: r8a7740: Add missing A4S pm domain devices
> [WIP] ARM: shmobile: armadillo800eva legacy: Add missing A3SP pm
> domain devices
> ARM: shmobile: armadillo800eva legacy: Add missing A4S pm domain
> devices
> ARM: shmobile: r8a7740: Add A3RV pm domain support
> ARM: shmobile: r8a7740: Add A3SG pm domain support
> [WIP] ARM: shmobile: r8a7740/armadillo legacy: Add A4MP pm domain
> support
> [WIP] ARM: shmobile: r8a7740: Add D4 pm domain support
> ARM: shmobile: r8a7740/armadillo legacy: Add A4R pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain support
> [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain support
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++++++-
> arch/arm/mach-shmobile/pm-r8a7740.c | 25 ++++++++++++++++++++++++
> arch/arm/mach-shmobile/setup-r8a7740.c | 11 +++++++++++
> 3 files changed, 46 insertions(+), 1 deletion(-)
>
> --
> 1.7.9.5
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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 Torvalds
>
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
2014-09-09 2:26 ` Simon Horman
(?)
@ 2014-09-09 9:48 ` Geert Uytterhoeven
-1 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-09-09 9:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Magnus,
On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> I would like Magnus's opinion but mine is that the non-WIP patches
> could be queued up. At least patch 1 and 2. Possibly others if
> they don't depend (other than diff noise) on WIP patches.
The legacy platforms are meant to be extinct in the near future, but
Armadillo-legacy already has some PM domain support, so adding a
little bit more can't hurt much, IMHO.
Besides diff noise, there should not be any dependencies on WIP patches.
> With the WIP patches, I am not entirely opposed to merging them
> too, so long as they move things in a good direction. And in particular
> don't break anything.
"[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
missing A3SP pm domain devices" should be OK, as this turned out to be
intended behavior.
"[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
support" probably introduces a regression for USB, as the domain is now
powered down after boot-up. I haven't tried USB on Armadillo yet, though.
So don't apply this one.
"[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
support" should be safe.
I would not apply the other WIP patches that add C99-commented-out code.
These issues must be fixed for DT as well.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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 Torvalds
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-09 9:48 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-09-09 9:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Magnus,
On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> I would like Magnus's opinion but mine is that the non-WIP patches
> could be queued up. At least patch 1 and 2. Possibly others if
> they don't depend (other than diff noise) on WIP patches.
The legacy platforms are meant to be extinct in the near future, but
Armadillo-legacy already has some PM domain support, so adding a
little bit more can't hurt much, IMHO.
Besides diff noise, there should not be any dependencies on WIP patches.
> With the WIP patches, I am not entirely opposed to merging them
> too, so long as they move things in a good direction. And in particular
> don't break anything.
"[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
missing A3SP pm domain devices" should be OK, as this turned out to be
intended behavior.
"[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
support" probably introduces a regression for USB, as the domain is now
powered down after boot-up. I haven't tried USB on Armadillo yet, though.
So don't apply this one.
"[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
support" should be safe.
I would not apply the other WIP patches that add C99-commented-out code.
These issues must be fixed for DT as well.
Thanks!
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 Torvalds
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-09 9:48 ` Geert Uytterhoeven
0 siblings, 0 replies; 45+ messages in thread
From: Geert Uytterhoeven @ 2014-09-09 9:48 UTC (permalink / raw)
To: Simon Horman
Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki,
Linux-sh list, Linux PM list, linux-arm-kernel
Hi Simon, Magnus,
On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> I would like Magnus's opinion but mine is that the non-WIP patches
> could be queued up. At least patch 1 and 2. Possibly others if
> they don't depend (other than diff noise) on WIP patches.
The legacy platforms are meant to be extinct in the near future, but
Armadillo-legacy already has some PM domain support, so adding a
little bit more can't hurt much, IMHO.
Besides diff noise, there should not be any dependencies on WIP patches.
> With the WIP patches, I am not entirely opposed to merging them
> too, so long as they move things in a good direction. And in particular
> don't break anything.
"[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
missing A3SP pm domain devices" should be OK, as this turned out to be
intended behavior.
"[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
support" probably introduces a regression for USB, as the domain is now
powered down after boot-up. I haven't tried USB on Armadillo yet, though.
So don't apply this one.
"[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
support" should be safe.
I would not apply the other WIP patches that add C99-commented-out code.
These issues must be fixed for DT as well.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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 Torvalds
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
2014-09-09 9:48 ` Geert Uytterhoeven
(?)
@ 2014-09-11 0:22 ` Simon Horman
-1 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-11 0:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 09, 2014 at 11:48:23AM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> > I would like Magnus's opinion but mine is that the non-WIP patches
> > could be queued up. At least patch 1 and 2. Possibly others if
> > they don't depend (other than diff noise) on WIP patches.
>
> The legacy platforms are meant to be extinct in the near future, but
> Armadillo-legacy already has some PM domain support, so adding a
> little bit more can't hurt much, IMHO.
>
> Besides diff noise, there should not be any dependencies on WIP patches.
>
> > With the WIP patches, I am not entirely opposed to merging them
> > too, so long as they move things in a good direction. And in particular
> > don't break anything.
>
> "[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
> missing A3SP pm domain devices" should be OK, as this turned out to be
> intended behavior.
>
> "[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
> support" probably introduces a regression for USB, as the domain is now
> powered down after boot-up. I haven't tried USB on Armadillo yet, though.
> So don't apply this one.
>
> "[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
> support" should be safe.
>
> I would not apply the other WIP patches that add C99-commented-out code.
> These issues must be fixed for DT as well.
Thanks Geert, that all sounds reasonable to me.
I will confer with Magnus.
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-11 0:22 ` Simon Horman
0 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-11 0:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 09, 2014 at 11:48:23AM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> > I would like Magnus's opinion but mine is that the non-WIP patches
> > could be queued up. At least patch 1 and 2. Possibly others if
> > they don't depend (other than diff noise) on WIP patches.
>
> The legacy platforms are meant to be extinct in the near future, but
> Armadillo-legacy already has some PM domain support, so adding a
> little bit more can't hurt much, IMHO.
>
> Besides diff noise, there should not be any dependencies on WIP patches.
>
> > With the WIP patches, I am not entirely opposed to merging them
> > too, so long as they move things in a good direction. And in particular
> > don't break anything.
>
> "[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
> missing A3SP pm domain devices" should be OK, as this turned out to be
> intended behavior.
>
> "[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
> support" probably introduces a regression for USB, as the domain is now
> powered down after boot-up. I haven't tried USB on Armadillo yet, though.
> So don't apply this one.
>
> "[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
> support" should be safe.
>
> I would not apply the other WIP patches that add C99-commented-out code.
> These issues must be fixed for DT as well.
Thanks Geert, that all sounds reasonable to me.
I will confer with Magnus.
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 00/11] ARM: shmobile: r8a7740/armadillo legacy prototype pm domain support
@ 2014-09-11 0:22 ` Simon Horman
0 siblings, 0 replies; 45+ messages in thread
From: Simon Horman @ 2014-09-11 0:22 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki,
Linux-sh list, Linux PM list, linux-arm-kernel
On Tue, Sep 09, 2014 at 11:48:23AM +0200, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> On Tue, Sep 9, 2014 at 4:26 AM, Simon Horman <horms@verge.net.au> wrote:
> > I would like Magnus's opinion but mine is that the non-WIP patches
> > could be queued up. At least patch 1 and 2. Possibly others if
> > they don't depend (other than diff noise) on WIP patches.
>
> The legacy platforms are meant to be extinct in the near future, but
> Armadillo-legacy already has some PM domain support, so adding a
> little bit more can't hurt much, IMHO.
>
> Besides diff noise, there should not be any dependencies on WIP patches.
>
> > With the WIP patches, I am not entirely opposed to merging them
> > too, so long as they move things in a good direction. And in particular
> > don't break anything.
>
> "[PATCH 03/11] [WIP] ARM: shmobile: armadillo800eva legacy: Add
> missing A3SP pm domain devices" should be OK, as this turned out to be
> intended behavior.
>
> "[PATCH 10/11] [WIP] ARM: shmobile: r8a7740: Add A4SU pm domain
> support" probably introduces a regression for USB, as the domain is now
> powered down after boot-up. I haven't tried USB on Armadillo yet, though.
> So don't apply this one.
>
> "[PATCH 11/11] [WIP] ARM: shmobile: r8a7740: Add A3SM pm domain
> support" should be safe.
>
> I would not apply the other WIP patches that add C99-commented-out code.
> These issues must be fixed for DT as well.
Thanks Geert, that all sounds reasonable to me.
I will confer with Magnus.
^ permalink raw reply [flat|nested] 45+ messages in thread