usb: phy: make it a menuconfig

We already have a considerable amount of USB
PHY drivers, making it a menuconfig just
prevents us from adding too much churn to
USB's menuconfig.

While at that, also select USB_OTG_UTILS from
this new menuconfig just to keep backwards
compatibility until we manage to remove
that symbol.

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/Makefile b/drivers/Makefile
index dce39a95fa71ee028285ebaa6d3a105eca1b4b97..3c200a243af0db5b51aa72d7b05345a1b09f8156 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -79,7 +79,7 @@ obj-$(CONFIG_ATA_OVER_ETH)    += block/aoe/
 obj-$(CONFIG_PARIDE)           += block/paride/
 obj-$(CONFIG_TC)               += tc/
 obj-$(CONFIG_UWB)              += uwb/
-obj-$(CONFIG_USB_OTG_UTILS)    += usb/
+obj-$(CONFIG_USB_PHY)          += usb/
 obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_PCI)              += usb/
 obj-$(CONFIG_USB_GADGET)       += usb/

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 32ce740a9dd501751064c6342989ed273cc94c76..832cd694fb8b15879381bfe4bc1137650b85ebfe 100644 (file)
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -1,8 +1,17 @@
 #
 # Physical Layer USB driver configuration
 #
-comment "USB Physical Layer drivers"
-       depends on USB || USB_GADGET
+menuconfig USB_PHY
+       tristate "USB Physical Layer drivers"
+       select USB_OTG_UTILS
+       help
+         USB controllers (those which are host, device or DRD) need a
+         device to handle the physical layer signalling, commonly called
+         a PHY.
+
+         The following drivers add support for such PHY devices.
+
+if USB_PHY
 
 config USB_OTG_UTILS
        bool
@@ -10,8 +19,6 @@ config USB_OTG_UTILS
          Select this to make sure the build includes objects from
          the OTG infrastructure directory.
 
-if USB || USB_GADGET
-
 #
 # USB Transceiver Drivers
 #
@@ -206,4 +213,4 @@ config USB_ULPI_VIEWPORT
          Provides read/write operations to the ULPI phy register set for
          controllers with a viewport register (e.g. Chipidea/ARC controllers).
 
-endif # USB || OTG
+endif # USB_PHY

diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index 34488ceef4916651f88aba78f27509101caf1778..d10a8b387ffe7a58c111c587cc8be69bc7a4a43e 100644 (file)
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -4,7 +4,7 @@
 
 ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 
-obj-$(CONFIG_USB_OTG_UTILS)            += phy.o
+obj-$(CONFIG_USB_PHY)                  += phy.o
 
 # transceiver drivers, keep the list sorted
 

diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index 15847cbdb512b804347b3219d60c7b96563fd9bd..b001dc3d635403b83077d315755710ad93d07688 100644 (file)
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -161,7 +161,7 @@ usb_phy_shutdown(struct usb_phy *x)
 }
 
 /* for usb host and peripheral controller drivers */
-#ifdef CONFIG_USB_OTG_UTILS
+#if IS_ENABLED(CONFIG_USB_PHY)
 extern struct usb_phy *usb_get_phy(enum usb_phy_type type);
 extern struct usb_phy *devm_usb_get_phy(struct device *dev,
        enum usb_phy_type type);