summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorBrian Austin <brian.austin@cirrus.com>2012-06-21 01:36:02 -0700
committerTony Lindgren <tony@atomide.com>2012-06-21 01:36:02 -0700
commitf6f6c9a5be996f266ff6fbe7850d76c3b0bdab95 (patch)
tree5a889c0d4e461afa6d632e23c609d39a13f12e7b /arch/arm
parentda0085ff9b2ca9ad21fd9fb380247e6639cccacd (diff)
downloadlwn-f6f6c9a5be996f266ff6fbe7850d76c3b0bdab95.tar.gz
lwn-f6f6c9a5be996f266ff6fbe7850d76c3b0bdab95.zip
ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
The beagleboard USB Host Port that is used is Port 2. The platform driver sets MODE_PHY for port 1 causing pin muxing to override the pins on the expansion connector P17 when using board_mux[]. Since USBHS Port 1 is not connected remove the case for muxing the USB Port1 pins by default. Tested with BeagleBoard xM revC and checked the userguides for Beagle xM and revC to be sure USB Port2 is what is used. Signed-off-by: Brian Austin <brian.austin@cirrus.com> Acked-by: Russ Dill <Russ.Dill@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 79c6909eeb78..75eb88a738c4 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -435,7 +435,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = {
static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
- .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
+ .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,