Commit c3788cd9 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

usb: roles: Add a description for the class to Kconfig 



That makes the USB role switch support option visible and
selectable for the user. The class driver is also moved to
drivers/usb/roles/ directory.

This will fix an issue that we have with the Intel USB role
switch driver on systems that don't have USB Type-C connectors:

Intel USB role switch driver depends on the USB role switch
class as it should, but since there was no way for the user
to enable the USB role switch class, there was also no way
to select that driver. USB Type-C drivers select the USB
role switch class which makes the Intel USB role switch
driver available and therefore hides the problem.

So in practice Intel USB role switch driver was depending on
USB Type-C drivers.

Fixes: f6fb9ec0 ("usb: roles: Add Intel xHCI USB role switch driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4733c0b4

drivers/usb/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -205,8 +205,4 @@ config USB_ULPI_BUS 
	  To compile this driver as a module, choose M here: the module will

	  be called ulpi.



config USB_ROLE_SWITCH

	tristate

	select USB_COMMON



endif # USB_SUPPORT

drivers/usb/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,4 +9,3 @@ usb-common-$(CONFIG_USB_LED_TRIG) += led.o 


obj-$(CONFIG_USB_OTG_FSM) += usb-otg-fsm.o

obj-$(CONFIG_USB_ULPI_BUS)	+= ulpi.o
 
obj-$(CONFIG_USB_ROLE_SWITCH)	+= roles.o

drivers/usb/roles/Kconfig

+13 −0
Original line number Diff line number Diff line 
config USB_ROLE_SWITCH

	tristate "USB Role Switch Support"

	help

	  USB Role Switch is a device that can select the USB role - host or

	  device - for a USB port (connector). In most cases dual-role capable

	  USB controller will also represent the switch, but on some platforms

	  multiplexer/demultiplexer switch is used to route the data lines on

	  the USB connector between separate USB host and device controllers.



	  Say Y here if your USB connectors support both device and host roles.

	  To compile the driver as module, choose M here: the module will be

	  called roles.ko.



if USB_ROLE_SWITCH



config USB_ROLES_INTEL_XHCI

drivers/usb/roles/Makefile

+3 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_USB_ROLE_SWITCH)		+= roles.o

roles-y					:= class.o

obj-$(CONFIG_USB_ROLES_INTEL_XHCI)	+= intel-xhci-usb-role-switch.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE