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

Commit 3da6ca35 authored by Roger Quadros's avatar Roger Quadros Committed by Tony Lindgren
Browse files

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



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

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

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

+10 −7
Original line number Diff line number Diff line
@@ -305,21 +305,22 @@ static struct omap_board_mux board_mux[] __initdata = { 
};

#endif



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 2,

		.reset_gpio = 147,

		.vcc_gpio = -EINVAL,

	},

};



static struct platform_device *omap3_touchbook_devices[] __initdata = {

	&leds_gpio,

	&keys_gpio,

};



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

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

	.reset_gpio_port[2]  = -EINVAL

};



static void omap3_touchbook_poweroff(void)
@@ -368,6 +369,8 @@ static void __init omap3_touchbook_init(void) 
	omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata);

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

	usb_musb_init(NULL);



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);

	board_nand_init(omap3touchbook_nand_partitions,

			ARRAY_SIZE(omap3touchbook_nand_partitions), NAND_CS,