diff options
author | Grazvydas Ignotas <notasas@gmail.com> | 2012-03-05 19:11:02 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-03-05 19:11:02 -0500 |
commit | 17e22caccfcefc3f45ab5eaafe7279ada3b3fbd6 (patch) | |
tree | 20f55045d7e8df7214a75d98e2dfd340ee03d042 /arch/arm | |
parent | b4c0a8a73b6a767550617339fb9129fbbebf82e3 (diff) |
ARM: omap: pandora: fix usbhs platform data
It turned out wrong OMAP HSUSB port was configured on pandora,
but still managed to work somehow. This was noticed after enabling
in-kernel mux, where USB muxing was causing other devices not to work,
because hsusb1 pins (instead of hsusb2) were wrongly remuxed, which
are used for other things on pandora.
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 1644b73017f..2224b5d873c 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -343,7 +343,7 @@ static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = { | |||
343 | }; | 343 | }; |
344 | 344 | ||
345 | static struct regulator_consumer_supply pandora_usb_phy_supply[] = { | 345 | static struct regulator_consumer_supply pandora_usb_phy_supply[] = { |
346 | REGULATOR_SUPPLY("hsusb0", "ehci-omap.0"), | 346 | REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"), |
347 | }; | 347 | }; |
348 | 348 | ||
349 | /* ads7846 on SPI and 2 nub controllers on I2C */ | 349 | /* ads7846 on SPI and 2 nub controllers on I2C */ |
@@ -561,13 +561,13 @@ static struct platform_device *omap3pandora_devices[] __initdata = { | |||
561 | 561 | ||
562 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { | 562 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
563 | 563 | ||
564 | .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, | 564 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |
565 | .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, | 565 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
566 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, | 566 | .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, |
567 | 567 | ||
568 | .phy_reset = true, | 568 | .phy_reset = true, |
569 | .reset_gpio_port[0] = 16, | 569 | .reset_gpio_port[0] = -EINVAL, |
570 | .reset_gpio_port[1] = -EINVAL, | 570 | .reset_gpio_port[1] = 16, |
571 | .reset_gpio_port[2] = -EINVAL | 571 | .reset_gpio_port[2] = -EINVAL |
572 | }; | 572 | }; |
573 | 573 | ||