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

Commit ee34e51a authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

usb: musb: choose correct fifo_mode 



When we start building glue layers as modules,
we need to be careful with the fifo_mode changes
otherwise that weird ifdeferry won't evaluate
correctly. Add the missing _MODULE variants for
all glue layers to prevent everybody from using
fifo_mode 2.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 62285963

drivers/usb/musb/musb_core.c

+8 −3
Original line number Diff line number Diff line
@@ -1010,10 +1010,15 @@ static void musb_shutdown(struct platform_device *pdev) 
 * We don't currently use dynamic fifo setup capability to do anything

 * more than selecting one of a bunch of predefined configurations.

 */

#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_OMAP2PLUS) \

	|| defined(CONFIG_USB_MUSB_AM35X)

#if defined(CONFIG_USB_MUSB_TUSB6010)			\

	|| defined(CONFIG_USB_MUSB_TUSB6010_MODULE)	\

	|| defined(CONFIG_USB_MUSB_OMAP2PLUS)		\

	|| defined(CONFIG_USB_MUSB_OMAP2PLUS_MODULE)	\

	|| defined(CONFIG_USB_MUSB_AM35X)		\

	|| defined(CONFIG_USB_MUSB_AM35X_MODULE)

static ushort __initdata fifo_mode = 4;

#elif defined(CONFIG_USB_MUSB_UX500)

#elif defined(CONFIG_USB_MUSB_UX500)			\

	|| defined(CONFIG_USB_MUSB_UX500_MODULE)

static ushort __initdata fifo_mode = 5;

#else

static ushort __initdata fifo_mode = 2;