lkml.org 
[lkml]   [2013]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/30] ARM: OMAP3: cm-t35: Adapt to ehci-omap changes
    Date
    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.

    Model RESET for HS USB Ports 1 and 2 as GPIO fixed regulators and
    link them to the 2 PHYs we just created.

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    ---
    arch/arm/mach-omap2/board-cm-t35.c | 95 ++++++++++++++++++++++++++++++++++--
    1 files changed, 90 insertions(+), 5 deletions(-)

    diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
    index cdf1d6e..71a7eb4 100644
    --- a/arch/arm/mach-omap2/board-cm-t35.c
    +++ b/arch/arm/mach-omap2/board-cm-t35.c
    @@ -29,6 +29,7 @@
    #include <linux/i2c/twl.h>
    #include <linux/regulator/fixed.h>
    #include <linux/regulator/machine.h>
    +#include <linux/usb/phy.h>
    #include <linux/mmc/host.h>

    #include <linux/spi/spi.h>
    @@ -418,15 +419,92 @@ static struct omap2_hsmmc_info mmc[] = {
    {} /* Terminator */
    };

    +/* 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 = OMAP_MAX_GPIO_LINES + 6,
    + .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,
    +};
    +
    +/* 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 = OMAP_MAX_GPIO_LINES + 7,
    + .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 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] = OMAP_MAX_GPIO_LINES + 6,
    - .reset_gpio_port[1] = OMAP_MAX_GPIO_LINES + 7,
    - .reset_gpio_port[2] = -EINVAL
    +static struct platform_device *usbhs_devices[] = {
    + &hsusb1_phy_device,
    + &hsusb1_reset_device,
    + &hsusb2_phy_device,
    + &hsusb2_reset_device,
    };

    static void __init cm_t35_init_usbh(void)
    @@ -443,6 +521,13 @@ static void __init cm_t35_init_usbh(void)
    msleep(1);
    }

    + platform_add_devices(usbhs_devices, ARRAY_SIZE(usbhs_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);
    }

    --
    1.7.4.1


    \
     
     \ /
      Last update: 2013-01-28 16:41    [W:4.032 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site