Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17e22cac authored by Grazvydas Ignotas's avatar Grazvydas Ignotas Committed by Tony Lindgren
Browse files

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: default avatarGrazvydas Ignotas <notasas@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b4c0a8a7

arch/arm/mach-omap2/board-omap3pandora.c

+5 −5
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = { 
};



static struct regulator_consumer_supply pandora_usb_phy_supply[] = {

	REGULATOR_SUPPLY("hsusb0", "ehci-omap.0"),

	REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"),

};



/* ads7846 on SPI and 2 nub controllers on I2C */
@@ -561,13 +561,13 @@ static struct platform_device *omap3pandora_devices[] __initdata = { 


static const struct usbhs_omap_board_data usbhs_bdata __initconst = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,

	.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]  = 16,

	.reset_gpio_port[1]  = -EINVAL,

	.reset_gpio_port[0]  = -EINVAL,

	.reset_gpio_port[1]  = 16,

	.reset_gpio_port[2]  = -EINVAL

};