These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / phy / Kconfig

diff --git a/kernel/drivers/usb/phy/Kconfig b/kernel/drivers/usb/phy/Kconfig
index 2175678..22e8ecb 100644 (file)
--- a/kernel/drivers/usb/phy/Kconfig
+++ b/kernel/drivers/usb/phy/Kconfig
@@ -21,7 +21,6 @@ config AB8500_USB
 config FSL_USB2_OTG
        bool "Freescale USB OTG Transceiver Driver"
        depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM && PM
-       select USB_OTG
        select USB_PHY
        help
          Enable this to support Freescale USB OTG transceiver.
@@ -91,7 +90,7 @@ config TWL6030_USB
 
 config USB_GPIO_VBUS
        tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST
        select USB_PHY
        help
          Provides simple GPIO VBUS sensing for controllers with an
@@ -141,6 +140,7 @@ config USB_MSM_OTG
        tristate "Qualcomm on-chip USB OTG controller support"
        depends on (USB || USB_GADGET) && (ARCH_QCOM || COMPILE_TEST)
        depends on RESET_CONTROLLER
+       depends on EXTCON
        select USB_PHY
        help
          Enable this to support the USB OTG transceiver on Qualcomm chips. It
@@ -151,10 +151,23 @@ config USB_MSM_OTG
          This driver is not supported on boards like trout which
          has an external PHY.
 
+config USB_QCOM_8X16_PHY
+       tristate "Qualcomm APQ8016/MSM8916 on-chip USB PHY controller support"
+       depends on ARCH_QCOM || COMPILE_TEST
+       depends on RESET_CONTROLLER && EXTCON
+       select USB_PHY
+       select USB_ULPI_VIEWPORT
+       help
+         Enable this to support the USB transceiver on Qualcomm 8x16 chipsets.
+         It handles PHY initialization, clock management, power management,
+         and workarounds required after resetting the hardware.
+
+         To compile this driver as a module, choose M here: the
+         module will be called phy-qcom-8x16-usb.
+
 config USB_MV_OTG
        tristate "Marvell USB OTG support"
-       depends on USB_EHCI_MV && USB_MV_UDC && PM
-       select USB_OTG
+       depends on USB_EHCI_MV && USB_MV_UDC && PM && USB_OTG
        select USB_PHY
        help
          Say Y here if you want to build Marvell USB OTG transciever
@@ -186,19 +199,6 @@ config USB_RCAR_PHY
          To compile this driver as a module, choose M here: the
          module will be called phy-rcar-usb.
 
-config USB_RCAR_GEN2_PHY
-       tristate "Renesas R-Car Gen2 USB PHY support"
-       depends on ARCH_R8A7790 || ARCH_R8A7791 || COMPILE_TEST
-       select USB_PHY
-       help
-         Say Y here to add support for the Renesas R-Car Gen2 USB PHY driver.
-         It is typically used to control internal USB PHY for USBHS,
-         and to configure shared USB channels 0 and 2.
-         This driver supports R8A7790 and R8A7791.
-
-         To compile this driver as a module, choose M here: the
-         module will be called phy-rcar-gen2-usb.
-
 config USB_ULPI
        bool "Generic ULPI Transceiver Driver"
        depends on ARM || ARM64