patch "usb: roles: Add a description for the class to Kconfig" added to usb-next

This is a note to let you know that I've just added the patch titled

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

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-next branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will also be merged in the next major kernel release during the merge window.

If you have any questions about this process, please let me know.

From: Heikki Krogerus <[email protected]>
Date: Wed, 12 Dec 2018 20:13:55 +0300
Subject: 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.

---
 drivers/usb/Kconfig                           |  4 ----
 drivers/usb/common/Makefile                   |  1 -
 drivers/usb/roles/Kconfig                     | 13 +++++++++++++
 drivers/usb/roles/Makefile                    |  4 +++-
 drivers/usb/{common/roles.c => roles/class.c} |  0
 5 files changed, 16 insertions(+), 6 deletions(-)
 rename drivers/usb/{common/roles.c => roles/class.c} (100%)

index 987fc5ba6321..70e6c956c23c 100644
@@ -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

index fb4d5ef4165c..0a7c45e85481 100644
@@ -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

index f5a5e6f79f1b..e4194ac94510 100644
@@ -1,3 +1,16 @@
+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

index e44b179ba275..c02873206fc1 100644
@@ -1 +1,3 @@
-obj-$(CONFIG_USB_ROLES_INTEL_XHCI) += intel-xhci-usb-role-switch.o
+obj-$(CONFIG_USB_ROLE_SWITCH)		+= roles.o
+roles-y					:= class.o
+obj-$(CONFIG_USB_ROLES_INTEL_XHCI)	+= intel-xhci-usb-role-switch.o

similarity index 100%
rename from drivers/usb/common/roles.c
rename to drivers/usb/roles/class.c

2.20.1