From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932809Ab3CLLq4 (ORCPT ); Tue, 12 Mar 2013 07:46:56 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:39602 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755506Ab3CLLoN (ORCPT ); Tue, 12 Mar 2013 07:44:13 -0400 From: Roger Quadros To: CC: , , , , , , Subject: [PATCH 17/24] ARM: OMAP3: overo: Adapt to ehci-omap changes Date: Tue, 12 Mar 2013 13:43:19 +0200 Message-ID: <1363088606-2692-18-git-send-email-rogerq@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1363088606-2692-1-git-send-email-rogerq@ti.com> References: <1363088606-2692-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 platform device for 'nop-usb-xceiv'. This will be used as a PHY for HS USB Port 2, so provide binding information for it. Model RESET for HS USB Port 2 as GPIO fixed regulator and link it to the 'nop-usb-xceiv' PHY. Signed-off-by: Roger Quadros Acked-by: Felipe Balbi --- arch/arm/mach-omap2/board-overo.c | 54 ++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 86bab51..5f93ba0 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -458,14 +459,51 @@ static int __init overo_spi_init(void) return 0; } +/* 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, +}; + +/* Regulator for HS USB Port 2 PHY reset */ +static struct regulator_consumer_supply hsusb2_reset_supplies[] = { + /* Link PHY device to reset supply so it gets used in the PHY driver */ + REGULATOR_SUPPLY("reset", "nop_usb_xceiv.2"), +}; + +static struct regulator_init_data hsusb2_reset_data = { + .constraints = { + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .consumer_supplies = hsusb2_reset_supplies, + .num_consumer_supplies = ARRAY_SIZE(hsusb2_reset_supplies), +}; + +static struct fixed_voltage_config hsusb2_reset_config = { + .supply_name = "hsusb2_reset", + .microvolts = 3300000, + .gpio = OVERO_GPIO_USBH_NRESET, + .startup_delay = 70000, /* 70msec */ + .enable_high = 1, + .enabled_at_boot = 0, /* keep in RESET */ + .init_data = &hsusb2_reset_data, +}; + +static struct platform_device hsusb2_reset_device = { + .name = "reg-fixed-voltage", + .id = PLATFORM_DEVID_AUTO, + .dev = { + .platform_data = &hsusb2_reset_config, + }, +}; + +static struct platform_device *overo_devices[] __initdata = { + &hsusb2_phy_device, + &hsusb2_reset_device, +}; + static struct usbhs_omap_platform_data usbhs_bdata __initdata = { - .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .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] = OVERO_GPIO_USBH_NRESET, - .reset_gpio_port[2] = -EINVAL }; #ifdef CONFIG_OMAP_MUX @@ -502,6 +540,10 @@ static void __init overo_init(void) ARRAY_SIZE(overo_nand_partitions), NAND_CS, 0, NULL); usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); + + platform_add_devices(overo_devices, ARRAY_SIZE(overo_devices)); + /* PHY on HSUSB Port 2 i.e. index 1 */ + usb_bind_phy("ehci-omap.0", 1, "nop_usb_xceiv.2"); usbhs_init(&usbhs_bdata); overo_spi_init(); overo_init_smsc911x(); -- 1.7.4.1