summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:47 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:47 +0200
commitcf899680feb87af09ea18eea87aa03ea56afd9ba (patch)
tree8e61cfc66e74b21928cfd8d69584d3324e7c31c2 /arch/arm/mach-shmobile/board-mackerel.c
parentd6a56ae7ac6121ef99500b3380e98f83a3d9e102 (diff)
parentcaaca999d335872a53b3fff8fa5af2de794d16a1 (diff)
Merge branch 'pm-shmobile'
* pm-shmobile: ARM: shmobile: Add A4S cpuidle state on sh7372 ARM: shmobile: Make sh7372 cpuidle handling more straightforward ARM: shmobile: Move definition of shmobile_init_late() to header ARM: shmobile: Remove the console check from sh7372_enter_suspend() ARM: shmobile: Rework adding devices to PM domains on AP4EVB ARM: shmobile: Rework adding devices to PM domains on Mackerel ARM: shmobile: Specify device latencies for Mackerel devices directly ARM: shmobile: Specify device latencies for SH7372 devices directly ARM: shmobile: Allow device latencies to be specified directly ARM: shmobile: Set PM domain on/off latencies directly ARM: shmobile: Make rmobile_init_pm_domain() static ARM: shmobile: Move r8a7779's PM domain objects to a table ARM: shmobile: Move r8a7740's PM domain objects to a table ARM: shmobile: Move sh7372's PM domain objects to a table ARM: shmobile: Do not access sh7372 A4S domain internals directly ARM: shmobile: Add routine for automatic PM domains initialization ARM: shmobile: Use domain names when adding subdomains to power domains ARM: shmobile: Drop r8a7779_add_device_to_domain() ARM: shmobile: Use names of power domains for adding devices to them
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index c129542f6ae..c76776a3e70 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1410,6 +1410,22 @@ static struct i2c_board_info i2c1_devices[] = {
#define USCCR1 0xE6058144
static void __init mackerel_init(void)
{
+ struct pm_domain_device domain_devices[] = {
+ { "A4LC", &lcdc_device, },
+ { "A4LC", &hdmi_lcdc_device, },
+ { "A4LC", &meram_device, },
+ { "A4MP", &fsi_device, },
+ { "A3SP", &usbhs0_device, },
+ { "A3SP", &usbhs1_device, },
+ { "A3SP", &nand_flash_device, },
+ { "A3SP", &sh_mmcif_device, },
+ { "A3SP", &sdhi0_device, },
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
+ { "A3SP", &sdhi1_device, },
+#endif
+ { "A3SP", &sdhi2_device, },
+ { "A4R", &ceu_device, },
+ };
u32 srcr4;
struct clk *clk;
@@ -1624,20 +1640,8 @@ static void __init mackerel_init(void)
platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
- rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device);
- rmobile_add_device_to_domain(&sh7372_pd_a4lc, &hdmi_lcdc_device);
- rmobile_add_device_to_domain(&sh7372_pd_a4lc, &meram_device);
- rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device);
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs0_device);
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs1_device);
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &nand_flash_device);
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device);
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device);
-#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device);
-#endif
- rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi2_device);
- rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device);
+ rmobile_add_devices_to_domains(domain_devices,
+ ARRAY_SIZE(domain_devices));
hdmi_init_pm_clock();
sh7372_pm_init();
@@ -1651,6 +1655,6 @@ MACHINE_START(MACKEREL, "mackerel")
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = mackerel_init,
- .init_late = shmobile_init_late,
+ .init_late = sh7372_pm_init_late,
.timer = &shmobile_timer,
MACHINE_END