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

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

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



Use usbhs_init_phys() to register the PHY's RESET regulators
and the NOP PHY devices.

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

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

+18 −14
Original line number Diff line number Diff line
@@ -527,26 +527,28 @@ static void __init igep_i2c_init(void) 
	omap3_pmic_init("twl4030", &igep_twldata);

}



static struct usbhs_phy_data igep2_phy_data[] __initdata = {

	{

		.port = 1,

		.reset_gpio = IGEP2_GPIO_USBH_NRESET,

		.vcc_gpio = -EINVAL,

	},

};



static struct usbhs_phy_data igep3_phy_data[] __initdata = {

	{

		.port = 2,

		.reset_gpio = IGEP3_GPIO_USBH_NRESET,

		.vcc_gpio = -EINVAL,

	},

};



static struct usbhs_omap_platform_data igep2_usbhs_bdata __initdata = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,



	.phy_reset = true,

	.reset_gpio_port[0] = IGEP2_GPIO_USBH_NRESET,

	.reset_gpio_port[1] = -EINVAL,

	.reset_gpio_port[2] = -EINVAL,

};



static struct usbhs_omap_platform_data igep3_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] = IGEP3_GPIO_USBH_NRESET,

	.reset_gpio_port[2] = -EINVAL,

};



#ifdef CONFIG_OMAP_MUX
@@ -642,8 +644,10 @@ static void __init igep_init(void) 
	if (machine_is_igep0020()) {

		omap_display_init(&igep2_dss_data);

		igep2_init_smsc911x();

		usbhs_init_phys(igep2_phy_data, ARRAY_SIZE(igep2_phy_data));

		usbhs_init(&igep2_usbhs_bdata);

	} else {

		usbhs_init_phys(igep3_phy_data, ARRAY_SIZE(igep3_phy_data));

		usbhs_init(&igep3_usbhs_bdata);

	}

}