From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755543Ab3COPRH (ORCPT ); Fri, 15 Mar 2013 11:17:07 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:59279 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754561Ab3COPRF (ORCPT ); Fri, 15 Mar 2013 11:17:05 -0400 From: Roger Quadros To: CC: , , , , , Subject: [PATCH v2 06/23] ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes Date: Fri, 15 Mar 2013 17:16:27 +0200 Message-ID: <1363360604-21368-7-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1363360604-21368-1-git-send-email-rogerq@ti.com> References: <1363360604-21368-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add 2 platform devices for 'nop-usb-xceiv'. These will be used as PHYs for HS USB ports 1 and 2 so provide binding information for them. Use usbhs_init_phys() to register the PHY's RESET regulators. Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/board-3430sdp.c | 47 ++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index ce812de..5584682 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -445,16 +446,37 @@ static void enable_board_wakeup_source(void) OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); } +/* PHY device on HS USB Port 1 i.e. nop_usb_xceiv.1 */ +static struct platform_device hsusb1_phy_device = { + .name = "nop_usb_xceiv", + .id = 1, +}; + +/* PHY device on HS USB Port 2 i.e. nop_usb_xceiv.2 */ +static struct platform_device hsusb2_phy_device = { + .name = "nop_usb_xceiv", + .id = 2, +}; + +static struct usbhs_phy_data phy_data[] __initdata = { + { + .port = 1, + .reset_gpio = 57, + .vcc_gpio = -EINVAL, + .phy_id = "nop_usb_xceiv.1", + }, + { + .port = 2, + .reset_gpio = 61, + .vcc_gpio = -EINVAL, + .phy_id = "nop_usb_xceiv.2", + }, +}; + static struct usbhs_omap_platform_data usbhs_bdata __initdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, - - .phy_reset = true, - .reset_gpio_port[0] = 57, - .reset_gpio_port[1] = 61, - .reset_gpio_port[2] = -EINVAL }; #ifdef CONFIG_OMAP_MUX @@ -585,6 +607,11 @@ static struct flash_partitions sdp_flash_partitions[] = { }, }; +static struct platform_device *sdp3430_devices[] __initdata = { + &hsusb1_phy_device, + &hsusb2_phy_device, +}; + static void __init omap_3430sdp_init(void) { int gpio_pendown; @@ -606,6 +633,14 @@ static void __init omap_3430sdp_init(void) board_flash_init(sdp_flash_partitions, chip_sel_3430, 0); sdp3430_display_init(); enable_board_wakeup_source(); + + platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices)); + /* PHY on HSUSB Port 1 i.e. index 0 */ + usb_bind_phy("ehci-omap.0", 0, "nop_usb_xceiv.1"); + /* PHY on HSUSB Port 2 i.e. index 1 */ + usb_bind_phy("ehci-omap.0", 1, "nop_usb_xceiv.2"); + + usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); usbhs_init(&usbhs_bdata); } -- 1.7.4.1