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

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

USB: MUSB: Add OMAP4 support in MUSB driver 



This patch adds CONFIG_ARCH_OMAP4 macro within
MUSB driver.

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 c71b1b9c

drivers/usb/musb/musb_core.c

+4 −2
Original line number Diff line number Diff line
@@ -985,7 +985,8 @@ static void musb_shutdown(struct platform_device *pdev) 
 * more than selecting one of a bunch of predefined configurations.

 */

#if defined(CONFIG_USB_TUSB6010) || \

	defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)

	defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \

	|| defined(CONFIG_ARCH_OMAP4)

static ushort __initdata fifo_mode = 4;

#else

static ushort __initdata fifo_mode = 2;
@@ -1456,7 +1457,8 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) 


/*-------------------------------------------------------------------------*/



#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)

#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \

	defined(CONFIG_ARCH_OMAP4)



static irqreturn_t generic_interrupt(int irq, void *__hci)

{

drivers/usb/musb/musb_core.h

+4 −2
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ enum musb_g_ep0_state { 
 */



#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \

		|| defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN)

		|| defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) \

		|| defined(CONFIG_ARCH_OMAP4)

/* REVISIT indexed access seemed to

 * misbehave (on DaVinci) for at least peripheral IN ...

 */
@@ -596,7 +597,8 @@ extern void musb_hnp_stop(struct musb *musb); 
extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode);



#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \

	defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)

	defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \

	defined(CONFIG_ARCH_OMAP4)

extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout);

#else

#define musb_platform_try_idle(x, y)		do {} while (0)