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

usb: musb: drop a gigantic amount of ifdeferry 



the MUSB IP is always OTG, so there's no point
in adding so many ifdefs on the code. Drop those
and always compile the driver for OTG support.

This also allows us to drop the useless "driver
mode" choice. For doing that, we need to make
musb depend on both Host and Peripheral side.

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

drivers/usb/musb/Kconfig

+1 −74
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ comment "Enable Host or Gadget support to see Inventra options" 


# (M)HDRC = (Multipoint) Highspeed Dual-Role Controller

config USB_MUSB_HDRC

	depends on (USB || USB_GADGET)

	depends on USB && USB_GADGET

	depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523))

	select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)

	select TWL4030_USB if MACH_OMAP_3430SDP
@@ -67,79 +67,6 @@ config USB_MUSB_UX500 


endchoice



choice

	prompt "Driver Mode"

	depends on USB_MUSB_HDRC

	help

	  Dual-Role devices can support both host and peripheral roles,

	  as well as a the special "OTG Device" role which can switch

	  between both roles as needed.



# use USB_MUSB_HDRC_HCD not USB_MUSB_HOST to #ifdef host side support;

# OTG needs both roles, not just USB_MUSB_HOST.

config USB_MUSB_HOST

	depends on USB

	bool "USB Host"

	help

	  Say Y here if your system supports the USB host role.

	  If it has a USB "A" (rectangular), "Mini-A" (uncommon),

	  or "Mini-AB" connector, it supports the host role.

	  (With a "Mini-AB" connector, you should enable USB OTG.)



# use USB_GADGET_MUSB_HDRC not USB_MUSB_PERIPHERAL to #ifdef peripheral

# side support ... OTG needs both roles

config USB_MUSB_PERIPHERAL

	depends on USB_GADGET

	bool "USB Peripheral (gadget stack)"

	select USB_GADGET_MUSB_HDRC

	help

	  Say Y here if your system supports the USB peripheral role.

	  If it has a USB "B" (squarish), "Mini-B", or "Mini-AB"

	  connector, it supports the peripheral role.

	  (With a "Mini-AB" connector, you should enable USB OTG.)



config USB_MUSB_OTG

	depends on USB && USB_GADGET && PM && EXPERIMENTAL

	bool "Both host and peripheral:  USB OTG (On The Go) Device"

	select USB_GADGET_MUSB_HDRC

	select USB_OTG

	help

	   The most notable feature of USB OTG is support for a

	   "Dual-Role" device, which can act as either a device

	   or a host.  The initial role choice can be changed

	   later, when two dual-role devices talk to each other.



	   At this writing, the OTG support in this driver is incomplete,

	   omitting the mandatory HNP or SRP protocols.  However, some

	   of the cable based role switching works.  (That is, grounding

	   the ID pin switches the controller to host mode, while leaving

	   it floating leaves it in peripheral mode.)



	   Select this if your system has a Mini-AB connector, or

	   to simplify certain kinds of configuration.



	   To implement your OTG Targeted Peripherals List (TPL), enable

	   USB_OTG_WHITELIST and update "drivers/usb/core/otg_whitelist.h"

	   to match your requirements.



endchoice



# enable peripheral support (including with OTG)

config USB_GADGET_MUSB_HDRC

	bool

	depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG)

#	default y

#	select USB_GADGET_DUALSPEED

#	select USB_GADGET_SELECTED



# enables host support (including with OTG)

config USB_MUSB_HDRC_HCD

	bool

	depends on USB_MUSB_HDRC && (USB_MUSB_HOST || USB_MUSB_OTG)

	select USB_OTG if USB_GADGET_MUSB_HDRC

	default y





config MUSB_PIO_ONLY

	bool 'Disable DMA (always use PIO)'

	depends on USB_MUSB_HDRC

drivers/usb/musb/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o 


musb_hdrc-y := musb_core.o



musb_hdrc-$(CONFIG_USB_GADGET_MUSB_HDRC)	+= musb_gadget_ep0.o musb_gadget.o

musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD)		+= musb_virthub.o musb_host.o

musb_hdrc-y					+= musb_gadget_ep0.o musb_gadget.o

musb_hdrc-y					+= musb_virthub.o musb_host.o

musb_hdrc-$(CONFIG_DEBUG_FS)			+= musb_debugfs.o



# Hardware Glue Layer

drivers/usb/musb/am35x.c

+0 −4
Original line number Diff line number Diff line
@@ -124,11 +124,7 @@ static void am35x_musb_disable(struct musb *musb) 
	musb_writel(reg_base, USB_END_OF_INTR_REG, 0);

}



#ifdef CONFIG_USB_MUSB_HDRC_HCD

#define portstate(stmt)		stmt

#else

#define portstate(stmt)

#endif



static void am35x_musb_set_vbus(struct musb *musb, int is_on)

{

drivers/usb/musb/blackfin.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
 * So, need to either use silicon v0.2+ or disable DMA mode in MUSB.

 */

#if ANOMALY_05000380 && defined(CONFIG_BF52x) && \

    defined(CONFIG_USB_MUSB_HDRC) && !defined(CONFIG_MUSB_PIO_ONLY)

	!defined(CONFIG_MUSB_PIO_ONLY)

# error "Please use PIO mode in MUSB driver on bf52x chip v0.0 and v0.1"

#endif

drivers/usb/musb/da8xx.c

+1 −11
Original line number Diff line number Diff line
@@ -172,11 +172,7 @@ static void da8xx_musb_disable(struct musb *musb) 
	musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0);

}



#ifdef CONFIG_USB_MUSB_HDRC_HCD

#define portstate(stmt)		stmt

#else

#define portstate(stmt)

#endif



static void da8xx_musb_set_vbus(struct musb *musb, int is_on)

{
@@ -397,21 +393,15 @@ static int da8xx_musb_set_mode(struct musb *musb, u8 musb_mode) 


	cfgchip2 &= ~CFGCHIP2_OTGMODE;

	switch (musb_mode) {

#ifdef	CONFIG_USB_MUSB_HDRC_HCD

	case MUSB_HOST:		/* Force VBUS valid, ID = 0 */

		cfgchip2 |= CFGCHIP2_FORCE_HOST;

		break;

#endif

#ifdef	CONFIG_USB_GADGET_MUSB_HDRC

	case MUSB_PERIPHERAL:	/* Force VBUS valid, ID = 1 */

		cfgchip2 |= CFGCHIP2_FORCE_DEVICE;

		break;

#endif

#ifdef	CONFIG_USB_MUSB_OTG

	case MUSB_OTG:		/* Don't override the VBUS/ID comparators */

		cfgchip2 |= CFGCHIP2_NO_OVERRIDE;

		break;

#endif

	default:

		dev_dbg(musb->controller, "Trying to set unsupported mode %u\n", musb_mode);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE