Browse Source

phy: fix Kconfig dependencies

DM816x PHY uses usb_phy_* methods and because
of that, it must select USB_PHY, however, because
the drivers in question (DM816x, TWL4030 and
OMAP_USB2) sit outside of drivers/usb/ directory,
meaning they can be built even if USB_SUPPORT=n.

This patches fixes the dependencies by adding
USB_SUPPORT as a dependency and making all drivers
select USB_PHY (which cannot be selected through
menuconfig).

Note that this fixes some linking breakages when
building with randconfig.

Cc: Tony Lindgren <tony@atomide.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Felipe Balbi 10 years ago
parent
commit
7f7a4d306f
1 changed files with 6 additions and 2 deletions
  1. 6 2
      drivers/phy/Kconfig

+ 6 - 2
drivers/phy/Kconfig

@@ -38,7 +38,9 @@ config ARMADA375_USBCLUSTER_PHY
 config PHY_DM816X_USB
 config PHY_DM816X_USB
 	tristate "TI dm816x USB PHY driver"
 	tristate "TI dm816x USB PHY driver"
 	depends on ARCH_OMAP2PLUS
 	depends on ARCH_OMAP2PLUS
+	depends on USB_SUPPORT
 	select GENERIC_PHY
 	select GENERIC_PHY
+	select USB_PHY
 	help
 	help
 	  Enable this for dm816x USB to work.
 	  Enable this for dm816x USB to work.
 
 
@@ -97,8 +99,9 @@ config OMAP_CONTROL_PHY
 config OMAP_USB2
 config OMAP_USB2
 	tristate "OMAP USB2 PHY Driver"
 	tristate "OMAP USB2 PHY Driver"
 	depends on ARCH_OMAP2PLUS
 	depends on ARCH_OMAP2PLUS
-	depends on USB_PHY
+	depends on USB_SUPPORT
 	select GENERIC_PHY
 	select GENERIC_PHY
+	select USB_PHY
 	select OMAP_CONTROL_PHY
 	select OMAP_CONTROL_PHY
 	depends on OMAP_OCP2SCP
 	depends on OMAP_OCP2SCP
 	help
 	help
@@ -122,8 +125,9 @@ config TI_PIPE3
 config TWL4030_USB
 config TWL4030_USB
 	tristate "TWL4030 USB Transceiver Driver"
 	tristate "TWL4030 USB Transceiver Driver"
 	depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
 	depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
-	depends on USB_PHY
+	depends on USB_SUPPORT
 	select GENERIC_PHY
 	select GENERIC_PHY
+	select USB_PHY
 	help
 	help
 	  Enable this to support the USB OTG transceiver on TWL4030
 	  Enable this to support the USB OTG transceiver on TWL4030
 	  family chips (including the TWL5030 and TPS659x0 devices).
 	  family chips (including the TWL5030 and TPS659x0 devices).