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

Commit 9b920867 authored by Roger Quadros's avatar Roger Quadros Committed by Tony Lindgren
Browse files

ARM: OMAP: zoom: 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 14c67d23

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

+10 −6
Original line number Diff line number Diff line
@@ -92,14 +92,16 @@ static struct mtd_partition zoom_nand_partitions[] = { 
	},

};



static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 2,

		.reset_gpio = ZOOM3_EHCI_RESET_GPIO,

		.vcc_gpio = -EINVAL,

	},

};



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]	= ZOOM3_EHCI_RESET_GPIO,

	.reset_gpio_port[2]	= -EINVAL,

};



static void __init omap_zoom_init(void)
@@ -109,6 +111,8 @@ static void __init omap_zoom_init(void) 
	} else if (machine_is_omap_zoom3()) {

		omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);

		omap_mux_init_gpio(ZOOM3_EHCI_RESET_GPIO, OMAP_PIN_OUTPUT);



		usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

		usbhs_init(&usbhs_bdata);

	}