aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-07-05 04:28:54 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-06 14:53:38 -0400
commitaa7541fd682110352b85d241021fe24bfe8a41c5 (patch)
treec5a60d1df92cafbc7618ddb71a5c3d770b4ebe7d /arch/arm
parentb9299a72702adc6d4d52a7425689255784431daa (diff)
ARM: shmobile: mackerel: switch to using pm-rmobile API
This patch switches mackerel platform to use pm-rmobile base common API. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index b577f7c44678..52170b1d017c 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1611,20 +1611,20 @@ static void __init mackerel_init(void)
1611 1611
1612 platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices)); 1612 platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
1613 1613
1614 sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device); 1614 rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device);
1615 sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device); 1615 rmobile_add_device_to_domain(&sh7372_pd_a4lc, &hdmi_lcdc_device);
1616 sh7372_add_device_to_domain(&sh7372_a4lc, &meram_device); 1616 rmobile_add_device_to_domain(&sh7372_pd_a4lc, &meram_device);
1617 sh7372_add_device_to_domain(&sh7372_a4mp, &fsi_device); 1617 rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device);
1618 sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs0_device); 1618 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs0_device);
1619 sh7372_add_device_to_domain(&sh7372_a3sp, &usbhs1_device); 1619 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs1_device);
1620 sh7372_add_device_to_domain(&sh7372_a3sp, &nand_flash_device); 1620 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &nand_flash_device);
1621 sh7372_add_device_to_domain(&sh7372_a3sp, &sh_mmcif_device); 1621 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device);
1622 sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi0_device); 1622 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device);
1623#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) 1623#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
1624 sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi1_device); 1624 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device);
1625#endif 1625#endif
1626 sh7372_add_device_to_domain(&sh7372_a3sp, &sdhi2_device); 1626 rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi2_device);
1627 sh7372_add_device_to_domain(&sh7372_a4r, &ceu_device); 1627 rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device);
1628 1628
1629 hdmi_init_pm_clock(); 1629 hdmi_init_pm_clock();
1630 sh7372_pm_init(); 1630 sh7372_pm_init();