Commit 9af54301 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: rename USB OTG hub configuration option 

The USB OTG code has the ability to disable external hubs, but the
configuration option for it is oddly named.  Rename it to be more
obvious as to what it does.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Bin Liu <b-liu@ti.com>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Eugeniu Rosca <erosca@de.adit-jv.com>
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: David Heinzelmann <heinzelmann.david@gmail.com>
Cc: "Lee, Chiasheng" <chiasheng.lee@intel.com>
Cc: Keiya Nobuta <nobuta.keiya@fujitsu.com>
Cc: Hardik Gajjar <hgajjar@de.adit-jv.com>
Link: https://lore.kernel.org/r/20200618094300.1887727-3-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 91c7eaa6

arch/mips/configs/gcw0_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ CONFIG_SND_SIMPLE_CARD=y 
CONFIG_USB_CONN_GPIO=y

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_OTG_BLACKLIST_HUB=y

CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_MUSB_HDRC=y

drivers/usb/core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config USB_OTG_WHITELIST 
	  "Targeted Peripherals List".  "Embedded Hosts" are likewise

	  allowed to support only a limited number of peripherals.



config USB_OTG_BLACKLIST_HUB

config USB_OTG_DISABLE_EXTERNAL_HUB

	bool "Disable external hubs"

	depends on USB_OTG || EXPERT

	help

drivers/usb/core/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -1834,7 +1834,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) 
		return -E2BIG;

	}



#ifdef	CONFIG_USB_OTG_BLACKLIST_HUB

#ifdef	CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB

	if (hdev->parent) {

		dev_warn(&intf->dev, "ignoring external hub\n");

		return -ENODEV;

drivers/usb/musb/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config USB_MUSB_JZ4740 
	depends on OF

	depends on MIPS || COMPILE_TEST

	depends on USB_MUSB_GADGET

	depends on USB=n || USB_OTG_BLACKLIST_HUB

	depends on USB=n || USB_OTG_DISABLE_EXTERNAL_HUB

	select USB_ROLE_SWITCH



config USB_MUSB_MEDIATEK

drivers/usb/musb/musb_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1637,8 +1637,8 @@ static int musb_core_init(u16 musb_type, struct musb *musb) 
		musb->is_multipoint = 0;

		type = "";

		if (IS_ENABLED(CONFIG_USB) &&

		    !IS_ENABLED(CONFIG_USB_OTG_BLACKLIST_HUB)) {

			pr_err("%s: kernel must blacklist external hubs\n",

		    !IS_ENABLED(CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB)) {

			pr_err("%s: kernel must disable external hubs, please fix the configuration\n",

			       musb_driver_name);

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE