From patchwork Mon Jan 28 11:30:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 2055541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 965F0E00C6 for ; Mon, 28 Jan 2013 11:43:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Tzn5m-00008V-1g; Mon, 28 Jan 2013 11:41:38 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tzmw7-000169-5J for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2013 11:31:40 +0000 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0SBVRBV001816; Mon, 28 Jan 2013 05:31:27 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0SBVRt9025622; Mon, 28 Jan 2013 05:31:27 -0600 Received: from dlelxv22.itg.ti.com (172.17.1.197) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Mon, 28 Jan 2013 05:31:27 -0600 Received: from rockdesk.itg.ti.com (h16-14.vpn.ti.com [172.24.16.14]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0SBUV6t024012; Mon, 28 Jan 2013 05:31:25 -0600 From: Roger Quadros To: Subject: [PATCH 19/30] ARM: OMAP: AM3517evm: Adapt to ehci-omap changes Date: Mon, 28 Jan 2013 13:30:20 +0200 Message-ID: <1359372631-8180-20-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1359372631-8180-1-git-send-email-rogerq@ti.com> References: <1359372631-8180-1-git-send-email-rogerq@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130128_063139_321680_3F9E3E4E X-CRM114-Status: GOOD ( 16.02 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux@arm.linux.org.uk, sameo@linux.intel.com, sshtylyov@mvista.com, eballetbo@gmail.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, stern@rowland.harvard.edu, javier@dowhile0.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add 2 platform devices for 'nop-usb-xceiv'. These will be used as a PHY for HS USB Port 1 and 2, so provide binding information for them. Model RESET for HS USB Port 1 as GPIO fixed regulator and link it to the 'nop-usb-xceiv' PHY on port 1. Signed-off-by: Roger Quadros Acked-by: Felipe Balbi --- arch/arm/mach-omap2/board-am3517evm.c | 66 ++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index c76725d..a06feb0 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include #include #include @@ -274,6 +277,50 @@ static __init void am3517_evm_mcbsp1_init(void) omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0); } +/* 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, +}; + +/* Regulator for HS USB Port 1 PHY reset */ +static struct regulator_consumer_supply hsusb1_reset_supplies[] = { + /* Link PHY device to reset supply so it gets used in the PHY driver */ + REGULATOR_SUPPLY("reset", "nop_usb_xceiv.1"), +}; + +static struct regulator_init_data hsusb1_reset_data = { + .constraints = { + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .consumer_supplies = hsusb1_reset_supplies, + .num_consumer_supplies = ARRAY_SIZE(hsusb1_reset_supplies), +}; + +static struct fixed_voltage_config hsusb1_reset_config = { + .supply_name = "hsusb1_reset", + .microvolts = 3300000, + .gpio = 57, + .startup_delay = 70000, /* 70msec */ + .enable_high = 1, + .enabled_at_boot = 0, /* keep in RESET */ + .init_data = &hsusb1_reset_data, +}; + +static struct platform_device hsusb1_reset_device = { + .name = "reg-fixed-voltage", + .id = PLATFORM_DEVID_AUTO, + .dev = { + .platform_data = &hsusb1_reset_config, + }, +}; + +/* 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_omap_platform_data usbhs_bdata __initdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \ @@ -282,12 +329,6 @@ static struct usbhs_omap_platform_data usbhs_bdata __initdata = { #else .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, #endif - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, - - .phy_reset = true, - .reset_gpio_port[0] = 57, - .reset_gpio_port[1] = -EINVAL, - .reset_gpio_port[2] = -EINVAL }; #ifdef CONFIG_OMAP_MUX @@ -349,6 +390,11 @@ static struct omap2_hsmmc_info mmc[] = { {} /* Terminator */ }; +static struct platform_device *am3517evm_devices[] __initdata = { + &hsusb1_phy_device, + &hsusb1_reset_device, + &hsusb2_phy_device, +}; static void __init am3517_evm_init(void) { @@ -361,6 +407,14 @@ static void __init am3517_evm_init(void) /* Configure GPIO for EHCI port */ omap_mux_init_gpio(57, OMAP_PIN_OUTPUT); + + platform_add_devices(am3517evm_devices, ARRAY_SIZE(am3517evm_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(&usbhs_bdata); am3517_evm_hecc_init(&am3517_evm_hecc_pdata); /* DSS */