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

Commit de2e1b0c authored by Maulik Mankad's avatar Maulik Mankad Committed by Greg Kroah-Hartman
Browse files

usb: musb: Set transceiver interface type 



Program the OTG_INTERFSEL register based on
transcevier type passed from board file.

Adapt signature of musb_platform_init() function
for davinci, blackfin and tusb6010.

Signed-off-by: default avatarMaulik Mankad <x0082077@ti.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e6c213b2

drivers/usb/musb/blackfin.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode) 
	return -EIO;

}



int __init musb_platform_init(struct musb *musb)

int __init musb_platform_init(struct musb *musb, void *board_data)

{



	/*

drivers/usb/musb/davinci.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb *musb, u8 mode) 
	return -EIO;

}



int __init musb_platform_init(struct musb *musb)

int __init musb_platform_init(struct musb *musb, void *board_data)

{

	void __iomem	*tibase = musb->ctrl_base;

	u32		revision;

drivers/usb/musb/musb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) 
	 * isp1504, non-OTG, etc) mostly hooking up through ULPI.

	 */

	musb->isr = generic_interrupt;

	status = musb_platform_init(musb);

	status = musb_platform_init(musb, plat->board_data);

	if (status < 0)

		goto fail2;

drivers/usb/musb/musb_core.h

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ extern int musb_platform_get_vbus_status(struct musb *musb); 
#define musb_platform_get_vbus_status(x)	0

#endif



extern int __init musb_platform_init(struct musb *musb);

extern int __init musb_platform_init(struct musb *musb, void *board_data);

extern int musb_platform_exit(struct musb *musb);



#endif	/* __MUSB_CORE_H__ */

drivers/usb/musb/omap2430.c

+11 −2
Original line number Diff line number Diff line
@@ -199,9 +199,10 @@ int musb_platform_set_mode(struct musb *musb, u8 musb_mode) 
	return 0;

}



int __init musb_platform_init(struct musb *musb)

int __init musb_platform_init(struct musb *musb, void *board_data)

{

	u32 l;

	struct omap_musb_board_data *data = board_data;



#if defined(CONFIG_ARCH_OMAP2430)

	omap_cfg_reg(AE5_2430_USB0HS_STP);
@@ -235,7 +236,15 @@ int __init musb_platform_init(struct musb *musb) 
	musb_writel(musb->mregs, OTG_SYSCONFIG, l);



	l = musb_readl(musb->mregs, OTG_INTERFSEL);



	if (data->interface_type == MUSB_INTERFACE_UTMI) {

		/* OMAP4 uses Internal PHY GS70 which uses UTMI interface */

		l &= ~ULPI_12PIN;       /* Disable ULPI */

		l |= UTMI_8BIT;         /* Enable UTMI  */

	} else {

		l |= ULPI_12PIN;

	}



	musb_writel(musb->mregs, OTG_INTERFSEL, l);



	pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, "