From patchwork Fri Mar 15 15:16:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 2278721 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 418793FC8A for ; Fri, 15 Mar 2013 15:19:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932126Ab3COPR3 (ORCPT ); Fri, 15 Mar 2013 11:17:29 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:59092 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932065Ab3COPR1 (ORCPT ); Fri, 15 Mar 2013 11:17:27 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2FFHOHX010538; Fri, 15 Mar 2013 10:17:24 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2FFHOLn002311; Fri, 15 Mar 2013 10:17:24 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Fri, 15 Mar 2013 10:17:23 -0500 Received: from localhost.localdomain (h16-152.vpn.ti.com [172.24.16.152]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2FFGjRe004649; Fri, 15 Mar 2013 10:17:21 -0500 From: Roger Quadros To: CC: , , , , , Subject: [PATCH v2 17/23] ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes Date: Fri, 15 Mar 2013 17:16:38 +0200 Message-ID: <1363360604-21368-18-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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Add 2 platform devices for 'nop-usb-xceiv'. These will be used as a PHY for HS USB Ports 1 and 2, so provide binding information for them. Use usbhs_init_phys() to register the PHY's RESET regulator. Signed-off-by: Roger Quadros --- arch/arm/mach-omap2/board-omap3touchbook.c | 38 ++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index bcd44fb..e8fa884 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -305,21 +306,37 @@ static struct omap_board_mux board_mux[] __initdata = { }; #endif +/* 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 = 2, + .reset_gpio = 147, + .vcc_gpio = -EINVAL, + .phy_id = "nop_usb_xceiv.2", + }, +}; + static struct platform_device *omap3_touchbook_devices[] __initdata = { &leds_gpio, &keys_gpio, + &hsusb1_phy_device, + &hsusb2_phy_device, }; 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] = -EINVAL, - .reset_gpio_port[1] = 147, - .reset_gpio_port[2] = -EINVAL }; static void omap3_touchbook_poweroff(void) @@ -368,6 +385,13 @@ static void __init omap3_touchbook_init(void) omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata); usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); + + /* 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); board_nand_init(omap3touchbook_nand_partitions, ARRAY_SIZE(omap3touchbook_nand_partitions), NAND_CS,