usb: rework CONFIG_USB_COMMON logic
Subsystems (2)
PATCH 1/1 usb: rework CONFIG_USB_COMMON logic
The phy-am335x driver selects 'USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB || USB_GADGET itself, which causes a Kconfig warning:
warning: (AM335X_PHY_USB) selects USB_COMMON which has unmet direct dependencies (USB_SUPPORT && (USB || USB_GADGET))
As suggested by Felipe Balbi, this turns the logic around, and makes 'USB_COMMON' selected by everything else that needs it, so we can remove the dependencies.
---
Preliminary for now, I've added it to my patch stack for randconfig tests and will test it overnight to see if any build-time regressions come up.
drivers/phy/Kconfig +2 -1
@@ -249,7 +249,8 @@ config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF depends on RESET_CONTROLLER - depends on USB_COMMON + depends on USB_SUPPORT + select USB_COMMON select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinner
drivers/usb/Kconfig +1 -2
@@ -31,8 +31,6 @@ if USB_SUPPORT config USB_COMMON tristate - default y - depends on USB || USB_GADGET config USB_ARCH_HAS_HCD def_bool y
@@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select USB_COMMON select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial bus
drivers/usb/gadget/Kconfig +1 -0
@@ -15,6 +15,7 @@ menuconfig USB_GADGET tristate "USB Gadget Support" + select USB_COMMON select NLS help USB is a master/slave protocol, organized with one master
Quoted 57 lines · Arnd Bergmann
The phy-am335x driver selects '
USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB ||USB_GADGETitself, which causes aKconfigwarning:warning: (
AM335X_PHY_USB) selectsUSB_COMMONwhich has unmet direct dependencies (USB_SUPPORT&& (USB ||USB_GADGET))As suggested by Felipe Balbi, this turns the logic around, and makes '
USB_COMMON' selected by everything else that needs it, so we can remove the dependencies.Fixes 59f042f644c5 ("usb: phy: phy-am335x: bypass first VBUS sensing for host-only mode")Signed-off-by Arnd Bergmann <[email protected]>---
Preliminary for now, I've added it to my patch stack for randconfig tests and will test it overnight to see if any build-time regressions come up.drivers/phy/Kconfig +2
-1@@ -249,7 +249,8 @@ config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF depends on RESET_CONTROLLER - depends on USB_COMMON + depends on USB_SUPPORT + select USB_COMMON select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinnerdrivers/usb/Kconfig +1
-2@@ -31,8 +31,6 @@ if USB_SUPPORT config USB_COMMON tristate - default y - depends on USB || USB_GADGET config USB_ARCH_HAS_HCD def_bool y@@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select USB_COMMON select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial busdrivers/usb/gadget/Kconfig +0
-0
drivers/usb/gadget/Kconfig line 21
Quoted 7 lines
drivers/usb/gadget/Kconfig +1
-0@@ -15,6 +15,7 @@ menuconfig USB_GADGET tristate "USB Gadget Support" + select USB_COMMON select NLS help USB is a master/slave protocol, organized with one master
Signature · 2 lines
Best Regards, Peter Chen
Quoted 3 lines · On Thursday 04 February 2016 14:39:16 Peter Chen wrote:
Quoted 3 lines
---
Preliminary for now, I've added it to my patch stack for randconfig tests and will test it overnight to see if any build-time regressions come up.
400 randconfig builds later, no obvious regressions, so please consider this a proper submission now.
Arnd
Hi Greg,
Quoted 4 lines · Arnd Bergmann
The phy-am335x driver selects '
USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB ||USB_GADGETitself, which causes aKconfigwarning:
Quoted 8 lines
warning: (
AM335X_PHY_USB) selectsUSB_COMMONwhich has unmet direct dependencies (USB_SUPPORT&& (USB ||USB_GADGET))As suggested by Felipe Balbi, this turns the logic around, and makes '
USB_COMMON' selected by everything else that needs it, so we can remove the dependencies.Fixes 59f042f644c5 ("usb: phy: phy-am335x: bypass first VBUS sensing for host-only mode")Signed-off-by Arnd Bergmann <[email protected]>
In case you wanna take this one directly to your queue, here's my Ack:
Let me know if you prefer that I take this through the gadget tree.
cheers
Signature · 1 line
balbi