diff options
| author | Roger Quadros <rogerq@ti.com> | 2013-03-20 11:44:44 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-02 12:59:54 -0400 |
| commit | 0047c909fbde59b6c90cb925bbfe1098d3796c2e (patch) | |
| tree | 6a80994107ca32d3bac06d05728d5a9ebb545bf3 | |
| parent | 60226717fe62cfc9ebe29ef0a6cd64bc1e0c49af (diff) | |
ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes
Use usbhs_init_phys() to register the PHY's RESET regulators
and the NOP PHY devices.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index ce812decfaca..7eb9651dd0f7 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
| @@ -445,16 +445,23 @@ static void enable_board_wakeup_source(void) | |||
| 445 | OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); | 445 | OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | static struct usbhs_phy_data phy_data[] __initdata = { | ||
| 449 | { | ||
| 450 | .port = 1, | ||
| 451 | .reset_gpio = 57, | ||
| 452 | .vcc_gpio = -EINVAL, | ||
| 453 | }, | ||
| 454 | { | ||
| 455 | .port = 2, | ||
| 456 | .reset_gpio = 61, | ||
| 457 | .vcc_gpio = -EINVAL, | ||
| 458 | }, | ||
| 459 | }; | ||
| 460 | |||
| 448 | static struct usbhs_omap_platform_data usbhs_bdata __initdata = { | 461 | static struct usbhs_omap_platform_data usbhs_bdata __initdata = { |
| 449 | 462 | ||
| 450 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, | 463 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, |
| 451 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, | 464 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
| 452 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, | ||
| 453 | |||
| 454 | .phy_reset = true, | ||
| 455 | .reset_gpio_port[0] = 57, | ||
| 456 | .reset_gpio_port[1] = 61, | ||
| 457 | .reset_gpio_port[2] = -EINVAL | ||
| 458 | }; | 465 | }; |
| 459 | 466 | ||
| 460 | #ifdef CONFIG_OMAP_MUX | 467 | #ifdef CONFIG_OMAP_MUX |
| @@ -606,6 +613,8 @@ static void __init omap_3430sdp_init(void) | |||
| 606 | board_flash_init(sdp_flash_partitions, chip_sel_3430, 0); | 613 | board_flash_init(sdp_flash_partitions, chip_sel_3430, 0); |
| 607 | sdp3430_display_init(); | 614 | sdp3430_display_init(); |
| 608 | enable_board_wakeup_source(); | 615 | enable_board_wakeup_source(); |
| 616 | |||
| 617 | usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data)); | ||
| 609 | usbhs_init(&usbhs_bdata); | 618 | usbhs_init(&usbhs_bdata); |
| 610 | } | 619 | } |
| 611 | 620 | ||