Merge tag 'phy-for-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon...

[linux-2.6-microblaze.git] / drivers / phy / Kconfig

diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 26566db..cc0b695 100644 (file)
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -15,6 +15,15 @@ config GENERIC_PHY
          phy users can obtain reference to the PHY. All the users of this
          framework should select this config.
 
+config PHY_BCM_NS_USB2
+       tristate "Broadcom Northstar USB 2.0 PHY Driver"
+       depends on ARCH_BCM_IPROC || COMPILE_TEST
+       depends on HAS_IOMEM && OF
+       select GENERIC_PHY
+       help
+         Enable this to support Broadcom USB 2.0 PHY connected to the USB
+         controller on Northstar family.
+
 config PHY_BERLIN_USB
        tristate "Marvell Berlin USB PHY Driver"
        depends on ARCH_BERLIN && RESET_CONTROLLER && HAS_IOMEM && OF
@@ -35,6 +44,16 @@ config ARMADA375_USBCLUSTER_PHY
        depends on OF && HAS_IOMEM
        select GENERIC_PHY
 
+config PHY_DA8XX_USB
+       tristate "TI DA8xx USB PHY Driver"
+       depends on ARCH_DAVINCI_DA8XX
+       select GENERIC_PHY
+       select MFD_SYSCON
+       help
+         Enable this to support the USB PHY on DA8xx SoCs.
+
+         This driver controls both the USB 1.1 PHY and the USB 2.0 PHY.
+
 config PHY_DM816X_USB
        tristate "TI dm816x USB PHY driver"
        depends on ARCH_OMAP2PLUS
@@ -113,14 +132,15 @@ config PHY_MIPHY365X
 
 config PHY_RCAR_GEN2
        tristate "Renesas R-Car generation 2 USB PHY driver"
-       depends on ARCH_SHMOBILE
+       depends on ARCH_RENESAS
        depends on GENERIC_PHY
        help
          Support for USB PHY found on Renesas R-Car generation 2 SoCs.
 
 config PHY_RCAR_GEN3_USB2
        tristate "Renesas R-Car generation 3 USB 2.0 PHY driver"
-       depends on OF && ARCH_SHMOBILE
+       depends on ARCH_RENESAS
+       depends on EXTCON
        select GENERIC_PHY
        help
          Support for USB 2.0 PHY found on Renesas R-Car generation 3 SoCs.
@@ -166,6 +186,7 @@ config TWL4030_USB
        tristate "TWL4030 USB Transceiver Driver"
        depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS
        depends on USB_SUPPORT
+       depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't 'y'
        select GENERIC_PHY
        select USB_PHY
        help
@@ -218,9 +239,8 @@ config PHY_MT65XX_USB3
        depends on ARCH_MEDIATEK && OF
        select GENERIC_PHY
        help
-         Say 'Y' here to add support for Mediatek USB3.0 PHY driver
-         for mt65xx SoCs. it supports two usb2.0 ports and
-         one usb3.0 port.
+         Say 'Y' here to add support for Mediatek USB3.0 PHY driver,
+         it supports multiple usb2.0 and usb3.0 ports.
 
 config PHY_HI6220_USB
        tristate "hi6220 USB PHY support"
@@ -250,7 +270,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
@@ -403,14 +424,15 @@ config PHY_TUSB1210
        help
          Support for TI TUSB1210 USB ULPI PHY.
 
-config PHY_BRCMSTB_SATA
-       tristate "Broadcom STB SATA PHY driver"
-       depends on ARCH_BRCMSTB || BMIPS_GENERIC
+config PHY_BRCM_SATA
+       tristate "Broadcom SATA PHY driver"
+       depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || COMPILE_TEST
        depends on OF
        select GENERIC_PHY
+       default ARCH_BCM_IPROC
        help
-         Enable this to support the SATA3 PHY on 28nm or 40nm Broadcom STB SoCs.
-         Likely useful only with CONFIG_SATA_BRCMSTB enabled.
+         Enable this to support the Broadcom SATA PHY.
+         If unsure, say N.
 
 config PHY_CYGNUS_PCIE
        tristate "Broadcom Cygnus PCIe PHY driver"
@@ -421,4 +443,6 @@ config PHY_CYGNUS_PCIE
          Enable this to support the Broadcom Cygnus PCIe PHY.
          If unsure, say N.
 
+source "drivers/phy/tegra/Kconfig"
+
 endmenu