diff --git a/[refs] b/[refs] index 58fb6da9e47f..55e8204e45eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1000076a88d58acf77d8fa8bf5d2567425b8ea1b +refs/heads/master: 0f54788d8b4f7aa8d74b0a5a0ad706bcc216b3c7 diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c index 9038bc9d856e..aeb7a4db49f4 100644 --- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -953,6 +953,8 @@ static void __init eva_clock_init(void) #define GPIO_PORT8CR 0xe6050008 static void __init eva_init(void) { + struct platform_device *usb = NULL; + regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, ARRAY_SIZE(fixed3v3_power_consumers), 3300000); @@ -1050,6 +1052,7 @@ static void __init eva_init(void) gpio_direction_input(GPIO_PORT209); platform_device_register(&usbhsf_device); + usb = &usbhsf_device; } /* SDHI0 */ @@ -1180,6 +1183,8 @@ static void __init eva_init(void) rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &lcdc0_device); rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &hdmi_lcdc_device); + if (usb) + rmobile_add_device_to_domain(&r8a7740_pd_a3sp, usb); } static void __init eva_earlytimer_init(void)