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

Commit 08a15fe8 authored by Roger Quadros's avatar Roger Quadros Committed by Tony Lindgren
Browse files

ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes 



Use usbhs_init_phys() to register the PHY's RESET regulator
and NOP PHY device. VAUX2 supplies the PHY's VCC.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6ef818ee

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

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



static struct regulator_consumer_supply pandora_usb_phy_supply[] = {

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

	REGULATOR_SUPPLY("vcc", "nop_usb_xceiv.2"),	/* hsusb port 2 */

};



/* ads7846 on SPI and 2 nub controllers on I2C */
@@ -561,6 +561,14 @@ static void __init pandora_wl1251_init(void) 
	printk(KERN_ERR "wl1251 board initialisation failed\n");

}



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 2,

		.reset_gpio = 16,

		.vcc_gpio = -EINVAL,

	},

};



static struct platform_device *omap3pandora_devices[] __initdata = {

	&pandora_leds_gpio,

	&pandora_keys_gpio,
@@ -569,15 +577,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = { 
};



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



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

	.reset_gpio_port[1]  = 16,

	.reset_gpio_port[2]  = -EINVAL

};



#ifdef CONFIG_OMAP_MUX
@@ -601,7 +601,10 @@ static void __init omap3pandora_init(void) 
	spi_register_board_info(omap3pandora_spi_board_info,

			ARRAY_SIZE(omap3pandora_spi_board_info));

	omap_ads7846_init(1, OMAP3_PANDORA_TS_GPIO, 0, NULL);



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);



	usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb");

	usb_musb_init(NULL);

	gpmc_nand_init(&pandora_nand_data, NULL);