| From 53725d0d63d021983ea26d4fe0cfa0df3fd60efc Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sun, 9 Jun 2013 00:38:41 +0400 |
| Subject: ARM: shmobile: BOCK-W: add USB support |
| |
| Register the USB PHY device from bockw_init(), passing the platform data to it. |
| Set machine's init_late() method to r8a7778_init_late() in order for [EO]HCI to |
| get registered too... |
| |
| Don't forget to add USB PENC0/1 pins to bockw_pinctrl_map[]. |
| |
| The patch has been tested on the BOCK-W board. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 1a87b01d3b18709ae240ec90ae612354dd44d9a9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/board-bockw.c |
| --- |
| arch/arm/mach-shmobile/board-bockw.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c |
| index 2b6103e5..f6ca2ae2 100644 |
| --- a/arch/arm/mach-shmobile/board-bockw.c |
| +++ b/arch/arm/mach-shmobile/board-bockw.c |
| @@ -56,6 +56,8 @@ static struct resource smsc911x_resources[] = { |
| DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */ |
| }; |
| |
| +static struct rcar_phy_platform_data usb_phy_platform_data __initdata; |
| + |
| /* SDHI */ |
| static struct sh_mobile_sdhi_info sdhi0_info = { |
| .tmio_caps = MMC_CAP_SD_HIGHSPEED, |
| @@ -69,6 +71,10 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { |
| "scif0_data_a", "scif0"), |
| PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778", |
| "scif0_ctrl", "scif0"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778", |
| + "usb0", "usb0"), |
| + PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778", |
| + "usb1", "usb1"), |
| /* SDHI0 */ |
| PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778", |
| "sdhi0", "sdhi0"), |
| @@ -85,6 +91,7 @@ static void __init bockw_init(void) |
| r8a7778_clock_init(); |
| r8a7778_init_irq_extpin(1); |
| r8a7778_add_standard_devices(); |
| + r8a7778_add_usb_phy_device(&usb_phy_platform_data); |
| |
| pinctrl_register_mappings(bockw_pinctrl_map, |
| ARRAY_SIZE(bockw_pinctrl_map)); |
| @@ -140,4 +147,5 @@ DT_MACHINE_START(BOCKW_DT, "bockw") |
| .init_machine = bockw_init, |
| .init_time = shmobile_timer_init, |
| .dt_compat = bockw_boards_compat_dt, |
| + .init_late = r8a7778_init_late, |
| MACHINE_END |
| -- |
| 1.8.4.3.gca3854a |
| |
