aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2012-07-05 04:28:00 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-06 14:42:55 -0400
commit0f54788d8b4f7aa8d74b0a5a0ad706bcc216b3c7 (patch)
tree4ab65b2bde9ddf698444cbf228c2e375a824ff1b
parent1000076a88d58acf77d8fa8bf5d2567425b8ea1b (diff)
ARM: shmobile: armadillo800eva: A3SP domain includes USB
Because USB Func is controlled by external IRQ mode, it is possible to control USB under A3SP domain to reduce power. This patch enables it. Armadillo800eva board switchs USB Host/Func by SW1.6, So, the device to adds into domain is selected on this patch. 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>
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 9038bc9d856e..aeb7a4db49f4 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -953,6 +953,8 @@ clock_error:
953#define GPIO_PORT8CR 0xe6050008 953#define GPIO_PORT8CR 0xe6050008
954static void __init eva_init(void) 954static void __init eva_init(void)
955{ 955{
956 struct platform_device *usb = NULL;
957
956 regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, 958 regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
957 ARRAY_SIZE(fixed3v3_power_consumers), 3300000); 959 ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
958 960
@@ -1050,6 +1052,7 @@ static void __init eva_init(void)
1050 gpio_direction_input(GPIO_PORT209); 1052 gpio_direction_input(GPIO_PORT209);
1051 1053
1052 platform_device_register(&usbhsf_device); 1054 platform_device_register(&usbhsf_device);
1055 usb = &usbhsf_device;
1053 } 1056 }
1054 1057
1055 /* SDHI0 */ 1058 /* SDHI0 */
@@ -1180,6 +1183,8 @@ static void __init eva_init(void)
1180 1183
1181 rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &lcdc0_device); 1184 rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &lcdc0_device);
1182 rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &hdmi_lcdc_device); 1185 rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &hdmi_lcdc_device);
1186 if (usb)
1187 rmobile_add_device_to_domain(&r8a7740_pd_a3sp, usb);
1183} 1188}
1184 1189
1185static void __init eva_earlytimer_init(void) 1190static void __init eva_earlytimer_init(void)