redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Renesas ARM Based SoC PM Cleanups for v3.18

Browse source 
* Make domain_devices[] static __initdata
 * Add and use rmobile_add_devices_to_domain
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUEO3IAAoJENfPZGlqN0++Aw4P/1g7ny/XioR5qsLsdM1eMPzK
 st/h4zvIitM+RCMEbDD7Ul/DuwN8lmnPIYtK5tEdMVxouSEnywTdrRXgK7EgJJrt
 vqd+LQul/y39um8FQ8He1w27CmL/ZKRyhFciV3JeZlo+VNqdPQ0NJWzlzBqqkxRs
 UIOXLBzH4ht+1sGbU4nbr/c1VzInT/2CgaGm3MwaX2HlfHACvsqN5yPwJZrNHcfN
 x6wXV5bvfuerXW5JLcPpb4SfmyhqFczbJZTQGDIOD786dawuWJU6Yu/UhvoY8gfk
 nukG8nqFsOCYqfcELgAt89CBIw3h5V2wQCUEPZ8wG1MU5CZjbW+S6iR2H/1igleV
 BvCPXAAd5E5zgntTpet1WB3f319hiihSKeAQ5065OUsh2GnQXjBzODg2BML/ijmV
 CXtaPj/rPsigLkIFny+VeW8vtfOyaBhg123v6/ck9p8AvIKzOwdQjtT8Ef5cuNL2
 b426y04vQkFmEiJ3XBU9wgbPEKA5QqSMFoNNhqDIWiMn6QkQYjtAi0SChDzSI+0r
 6LUPLrkFe4OxcrFMVsjwI8rPbwUW8QICqBzqIDAj2gNo8mLMZPiDsnj3o6m6xZ36
 y2rFAgnlJP5gqny04MKgqC/oN+gT8iZFRDcem5VQ8QV/sUzLXYZfqFJpJovCIUUQ
 KA/UVDXrxYGcQ48xxuSi
 =5GhR
 -----END PGP SIGNATURE-----

Merge tag 'renesas-pm-cleanups-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Pull "Renesas ARM Based SoC PM Cleanups for v3.18" from Simon Horman:

* Make domain_devices[] static __initdata
* Add and use rmobile_add_devices_to_domain

Signed-off-by: Arnd Bergmann <ardn@arndb.de>

* tag 'renesas-pm-cleanups-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
  ARM: shmobile: r8a7740: Clean up pm domain table
  ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
  ARM: shmobile: sh7372: Make domain_devices[] static __initdata
  ARM: shmobile: mackerel: Make domain_devices[] static __initdata
This commit is contained in:
Arnd Bergmann 2014-09-11 09:46:38 +02:00
parent c40c4028f0 834720dbf0
commit 9136ce8892
5 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/mach-shmobile/board-armadillo800eva.c
View file

@ -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
arch/arm/mach-shmobile/board-mackerel.c
View file

@ -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, },

10
arch/arm/mach-shmobile/pm-r8a7740.c
View file

@ -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)

26
arch/arm/mach-shmobile/setup-r8a7740.c
View file

@ -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
arch/arm/mach-shmobile/setup-sh7372.c
View file

@ -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, },