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

Commit 58a5491c authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

omap: Add platform init code for EHCI driver 



Add platform init code for EHCI driver.

Various fixes to the original patch by Ajay Kumar Gupta <ajay.gupta@ti.com>
and Anand Gadiyar <gadiyar@ti.com>.

Overo support added by Olof Johansson <olof@lixom.net>
Beagle support added by Koen Kooi <koen@beagleboard.org>
CM-T32 support added by Mike Rapoport <mike@compulab.co.il>

Signed-off-by: default avatarSigned-off-by: Olof Johansson <olof@lixom.net>
Acked-by: default avatarSteve Sakoman <steve@sakoman.com>
Signed-off-by: default avatarKoen Kooi <koen@beagleboard.org>
Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: default avatarAnand Gadiyar <gadiyar@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 83720a82

arch/arm/mach-omap2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o 
# Platform specific device init code

obj-y					+= usb-musb.o

obj-$(CONFIG_MACH_OMAP2_TUSB6010)	+= usb-tusb6010.o

obj-y					+= usb-ehci.o



onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o

obj-y					+= $(onenand-m) $(onenand-y)

arch/arm/mach-omap2/board-3430sdp.c

+13 −0
Original line number Diff line number Diff line
@@ -494,6 +494,18 @@ static void enable_board_wakeup_source(void) 
	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */

}



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {



	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,



	.phy_reset  = true,

	.reset_gpio_port[0]  = 57,

	.reset_gpio_port[1]  = 61,

	.reset_gpio_port[2]  = -EINVAL

};



static void __init omap_3430sdp_init(void)

{

	omap3430_i2c_init();
@@ -510,6 +522,7 @@ static void __init omap_3430sdp_init(void) 
	usb_musb_init();

	board_smc91x_init();

	enable_board_wakeup_source();

	usb_ehci_init(&ehci_pdata);

}



static void __init omap_3430sdp_map_io(void)

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

+13 −0
Original line number Diff line number Diff line
@@ -410,6 +410,18 @@ static void __init omap3beagle_flash_init(void) 
	}

}



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {



	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,



	.phy_reset  = true,

	.reset_gpio_port[0]  = -EINVAL,

	.reset_gpio_port[1]  = 147,

	.reset_gpio_port[2]  = -EINVAL

};



static void __init omap3_beagle_init(void)

{

	omap3_beagle_i2c_init();
@@ -423,6 +435,7 @@ static void __init omap3_beagle_init(void) 
	gpio_direction_output(170, true);



	usb_musb_init();

	usb_ehci_init(&ehci_pdata);

	omap3beagle_flash_init();



	/* Ensure SDRC pins are mux'd for self-refresh */

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

+15 −0
Original line number Diff line number Diff line
@@ -307,6 +307,18 @@ static struct platform_device *omap3_evm_devices[] __initdata = { 
	&omap3evm_smc911x_device,

};



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {



	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,

	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,



	.phy_reset  = true,

	.reset_gpio_port[0]  = -EINVAL,

	.reset_gpio_port[1]  = 135,

	.reset_gpio_port[2]  = -EINVAL

};



static void __init omap3_evm_init(void)

{

	omap3_evm_i2c_init();
@@ -322,6 +334,9 @@ static void __init omap3_evm_init(void) 
	usb_nop_xceiv_register();

#endif

	usb_musb_init();

	/* Setup EHCI phy reset padconfig */

	omap_cfg_reg(AF4_34XX_GPIO135_OUT);

	usb_ehci_init(&ehci_pdata);

	ads7846_dev_init();

}

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

+13 −0
Original line number Diff line number Diff line
@@ -397,6 +397,18 @@ static struct platform_device *omap3pandora_devices[] __initdata = { 
	&pandora_keys_gpio,

};



static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {



	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,

	.port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,

	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,



	.phy_reset  = true,

	.reset_gpio_port[0]  = 16,

	.reset_gpio_port[1]  = -EINVAL,

	.reset_gpio_port[2]  = -EINVAL

};



static void __init omap3pandora_init(void)

{

	omap3pandora_i2c_init();
@@ -406,6 +418,7 @@ static void __init omap3pandora_init(void) 
	spi_register_board_info(omap3pandora_spi_board_info,

			ARRAY_SIZE(omap3pandora_spi_board_info));

	omap3pandora_ads7846_init();

	usb_ehci_init(&ehci_pdata);

	pandora_keys_gpio_init();

	usb_musb_init();