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

Commit 6ef818ee authored by Roger Quadros's avatar Roger Quadros Committed by Tony Lindgren
Browse files

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



Use usbhs_init_phys() to register the PHY's RESET regulator
and the 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 9c4d678e

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

+13 −12
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ struct wl12xx_platform_data omap3evm_wlan_data __initdata = { 
static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = {

	REGULATOR_SUPPLY("VDD_CSIPHY1", "omap3isp"),	/* OMAP ISP */

	REGULATOR_SUPPLY("VDD_CSIPHY2", "omap3isp"),	/* OMAP ISP */

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

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

	REGULATOR_SUPPLY("vaux2", NULL),

};
@@ -539,17 +539,16 @@ static int __init omap3_evm_i2c_init(void) 
	return 0;

}



static struct usbhs_omap_platform_data usbhs_bdata __initdata = {

static struct usbhs_phy_data phy_data[] __initdata = {

	{

		.port = 2,

		.reset_gpio = -1,	/* set at runtime */

		.vcc_gpio = -EINVAL,

	},

};



	.port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,



	.phy_reset  = true,

	/* PHY reset GPIO will be runtime programmed based on EVM version */

	.reset_gpio_port[0]  = -EINVAL,

	.reset_gpio_port[1]  = -EINVAL,

	.reset_gpio_port[2]  = -EINVAL

};



#ifdef CONFIG_OMAP_MUX
@@ -725,7 +724,7 @@ static void __init omap3_evm_init(void) 


		/* setup EHCI phy reset config */

		omap_mux_init_gpio(21, OMAP_PIN_INPUT_PULLUP);

		usbhs_bdata.reset_gpio_port[1] = 21;

		phy_data[0].reset_gpio = 21;



		/* EVM REV >= E can supply 500mA with EXTVBUS programming */

		musb_board_data.power = 500;
@@ -733,10 +732,12 @@ static void __init omap3_evm_init(void) 
	} else {

		/* setup EHCI phy reset on MDC */

		omap_mux_init_gpio(135, OMAP_PIN_OUTPUT);

		usbhs_bdata.reset_gpio_port[1] = 135;

		phy_data[0].reset_gpio = 135;

	}

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

	usb_musb_init(&musb_board_data);



	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));

	usbhs_init(&usbhs_bdata);

	board_nand_init(omap3evm_nand_partitions,

			ARRAY_SIZE(omap3evm_nand_partitions), NAND_CS,