aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-07-01 16:14:34 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2011-07-02 08:29:57 -0400
commit96f7934e448fd52644b8862ea12761e1524f3bf3 (patch)
tree97e7548b9bd1e1f442cc0690d4fa4f3440b32557
parente3e0109138376bb262b8ecf33bad0586fa131925 (diff)
ARM: mach-shmobile: sh7372 A4LC support for AP4EVB
The AP4EVB board is also using a sh7372 SoC, so tie in A4LC support on that board as well. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c3
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c1
-rw-r--r--arch/arm/mach-shmobile/setup-sh7372.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 803bc6edfca..a26f895cdc8 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -1408,6 +1408,9 @@ static void __init ap4evb_init(void)
1408 1408
1409 platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices)); 1409 platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));
1410 1410
1411 sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc1_device);
1412 sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
1413
1411 hdmi_init_pm_clock(); 1414 hdmi_init_pm_clock();
1412 fsi_init_pm_clock(); 1415 fsi_init_pm_clock();
1413 sh7372_pm_init(); 1416 sh7372_pm_init();
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index f93b1cb27fe..cc1ccd899cd 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1582,7 +1582,6 @@ static void __init mackerel_init(void)
1582 1582
1583 platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices)); 1583 platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
1584 1584
1585 sh7372_init_pm_domain(&sh7372_a4lc);
1586 sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device); 1585 sh7372_add_device_to_domain(&sh7372_a4lc, &lcdc_device);
1587 sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device); 1586 sh7372_add_device_to_domain(&sh7372_a4lc, &hdmi_lcdc_device);
1588 1587
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index cd807eea69e..ec1ae8cc9ca 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -841,6 +841,8 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
841 841
842void __init sh7372_add_standard_devices(void) 842void __init sh7372_add_standard_devices(void)
843{ 843{
844 sh7372_init_pm_domain(&sh7372_a4lc);
845
844 platform_add_devices(sh7372_early_devices, 846 platform_add_devices(sh7372_early_devices,
845 ARRAY_SIZE(sh7372_early_devices)); 847 ARRAY_SIZE(sh7372_early_devices));
846 848