* [PATCH 1/5] ARM: shmobile: mackerel: Make domain_devices[] static __initdata
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 2/5] ARM: shmobile: sh7372: " Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Make the domain_devices[] array static and __initdata, to reduce kernel
size:
- Making it static gets rid of the code to copy the data to the stack,
- Marking it __initdata allows more init memory to be freed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-mackerel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 79f448e..d47b262 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1420,7 +1420,7 @@ static const struct pinctrl_map mackerel_pinctrl_map[] = {
#define USCCR1 IOMEM(0xE6058144)
static void __init mackerel_init(void)
{
- struct pm_domain_device domain_devices[] = {
+ static struct pm_domain_device domain_devices[] __initdata = {
{ "A4LC", &lcdc_device, },
{ "A4LC", &hdmi_lcdc_device, },
{ "A4LC", &meram_device, },
--
2.0.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] ARM: shmobile: sh7372: Make domain_devices[] static __initdata
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
2014-09-11 0:57 ` [PATCH 1/5] ARM: shmobile: mackerel: Make domain_devices[] static __initdata Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 3/5] ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains() Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Make the domain_devices[] array static and __initdata, to reduce kernel
size:
- Making it static gets rid of the code to copy the data to the stack,
- Marking it __initdata allows more init memory to be freed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-sh7372.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 9cdfcdfd..a04fa5f 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -927,7 +927,7 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
void __init sh7372_add_standard_devices(void)
{
- struct pm_domain_device domain_devices[] = {
+ static struct pm_domain_device domain_devices[] __initdata = {
{ "A3RV", &vpu_device, },
{ "A4MP", &spu0_device, },
{ "A4MP", &spu1_device, },
--
2.0.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
2014-09-11 0:57 ` [PATCH 1/5] ARM: shmobile: mackerel: Make domain_devices[] static __initdata Simon Horman
2014-09-11 0:57 ` [PATCH 2/5] ARM: shmobile: sh7372: " Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 4/5] ARM: shmobile: r8a7740: Clean up pm domain table Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Use a table and the rmobile_add_devices_to_domains() helper function to
add all platform devices to their power domains at once, which is more
size-efficient than calling rmobile_add_device_to_domain() explicitly
for all devices individually.
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 | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 3d5eaca..30df532 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -747,6 +747,19 @@ static void r8a7740_i2c_workaround(struct platform_device *pdev)
void __init r8a7740_add_standard_devices(void)
{
+ static struct pm_domain_device domain_devices[] __initdata = {
+ { "A3SP", &scif0_device },
+ { "A3SP", &scif1_device },
+ { "A3SP", &scif2_device },
+ { "A3SP", &scif3_device },
+ { "A3SP", &scif4_device },
+ { "A3SP", &scif5_device },
+ { "A3SP", &scif6_device },
+ { "A3SP", &scif7_device },
+ { "A3SP", &scif8_device },
+ { "A3SP", &i2c1_device },
+ };
+
/* I2C work-around */
r8a7740_i2c_workaround(&i2c0_device);
r8a7740_i2c_workaround(&i2c1_device);
@@ -762,17 +775,8 @@ void __init r8a7740_add_standard_devices(void)
ARRAY_SIZE(r8a7740_late_devices));
/* add devices to PM domain */
-
- rmobile_add_device_to_domain("A3SP", &scif0_device);
- rmobile_add_device_to_domain("A3SP", &scif1_device);
- rmobile_add_device_to_domain("A3SP", &scif2_device);
- rmobile_add_device_to_domain("A3SP", &scif3_device);
- rmobile_add_device_to_domain("A3SP", &scif4_device);
- rmobile_add_device_to_domain("A3SP", &scif5_device);
- rmobile_add_device_to_domain("A3SP", &scif6_device);
- rmobile_add_device_to_domain("A3SP", &scif7_device);
- rmobile_add_device_to_domain("A3SP", &scif8_device);
- rmobile_add_device_to_domain("A3SP", &i2c1_device);
+ rmobile_add_devices_to_domains(domain_devices,
+ ARRAY_SIZE(domain_devices));
}
void __init r8a7740_add_early_devices(void)
--
2.0.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] ARM: shmobile: r8a7740: Clean up pm domain table
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
` (2 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 3/5] ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains() Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 0:57 ` [PATCH 5/5] ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains() Simon Horman
2014-09-11 8:19 ` [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Arnd Bergmann
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
- Sort pm domains by bit_shift value,
- Combine closing and opening curly braces on a single line, as the
table will grow much bigger soon.
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 | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c
index a0d44d5..3d50714 100644
--- a/arch/arm/mach-shmobile/pm-r8a7740.c
+++ b/arch/arm/mach-shmobile/pm-r8a7740.c
@@ -34,23 +34,21 @@ static int r8a7740_pd_a3sp_suspend(void)
static struct rmobile_pm_domain r8a7740_pm_domains[] = {
{
+ .genpd.name = "A4LC",
+ .bit_shift = 1,
+ }, {
.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,
.gov = &pm_domain_always_on_gov,
.no_debug = true,
.suspend = r8a7740_pd_a3sp_suspend,
},
- {
- .genpd.name = "A4LC",
- .bit_shift = 1,
- },
};
void __init r8a7740_init_pm_domains(void)
--
2.0.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
` (3 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 4/5] ARM: shmobile: r8a7740: Clean up pm domain table Simon Horman
@ 2014-09-11 0:57 ` Simon Horman
2014-09-11 8:19 ` [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Arnd Bergmann
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-09-11 0:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Use a table and the rmobile_add_devices_to_domains() helper function to
add all platform devices to their power domains at once, which is more
size-efficient than calling rmobile_add_device_to_domain() explicitly
for all devices individually.
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, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 6dbaad6..e709835 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1231,6 +1231,10 @@ clock_error:
#define GPIO_PORT8CR IOMEM(0xe6050008)
static void __init eva_init(void)
{
+ static struct pm_domain_device domain_devices[] __initdata = {
+ { "A4LC", &lcdc0_device },
+ { "A4LC", &hdmi_lcdc_device },
+ };
struct platform_device *usb = NULL;
regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
@@ -1316,8 +1320,8 @@ static void __init eva_init(void)
platform_add_devices(eva_devices,
ARRAY_SIZE(eva_devices));
- rmobile_add_device_to_domain("A4LC", &lcdc0_device);
- rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device);
+ rmobile_add_devices_to_domains(domain_devices,
+ ARRAY_SIZE(domain_devices));
if (usb)
rmobile_add_device_to_domain("A3SP", usb);
--
2.0.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18
2014-09-11 0:57 [GIT PULL] Renesas ARM Based SoC PM Cleanups for v3.18 Simon Horman
` (4 preceding siblings ...)
2014-09-11 0:57 ` [PATCH 5/5] ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains() Simon Horman
@ 2014-09-11 8:19 ` Arnd Bergmann
5 siblings, 0 replies; 7+ messages in thread
From: Arnd Bergmann @ 2014-09-11 8:19 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 11 September 2014 09:57:24 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC PM cleanups for v3.18.
>
>
> The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
>
> Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pm-cleanups-for-v3.18
>
> for you to fetch changes up to 834720dbf03819a8b2d0ba5fbe01d008267f9da6:
>
> ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains() (2014-09-09 11:16:08 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC PM Cleanups for v3.18
>
> * Make domain_devices[] static __initdata
> * Add and use rmobile_add_devices_to_domain
>
Pulled into next/cleanup, thanks!
Arnd
^ permalink raw reply [flat|nested] 7+ messages in thread