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

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

diff --git a/kernel/drivers/net/phy/Kconfig b/kernel/drivers/net/phy/Kconfig
index 70641d2..60994a8 100644 (file)
--- a/kernel/drivers/net/phy/Kconfig
+++ b/kernel/drivers/net/phy/Kconfig
@@ -14,6 +14,11 @@ if PHYLIB
 
 comment "MII PHY device drivers"
 
+config AQUANTIA_PHY
+        tristate "Drivers for the Aquantia PHYs"
+        ---help---
+          Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405
+
 config AT803X_PHY
        tristate "Drivers for Atheros AT803X PHYs"
        ---help---
@@ -24,13 +29,6 @@ config AMD_PHY
        ---help---
          Currently supports the am79c874
 
-config AMD_XGBE_PHY
-       tristate "Driver for the AMD 10GbE (amd-xgbe) PHYs"
-       depends on (OF || ACPI) && HAS_IOMEM
-       depends on ARM64 || COMPILE_TEST
-       ---help---
-         Currently supports the AMD 10GbE PHY
-
 config MARVELL_PHY
        tristate "Drivers for Marvell PHYs"
        ---help---
@@ -61,25 +59,49 @@ config VITESSE_PHY
         ---help---
           Currently supports the vsc8244
 
+config TERANETICS_PHY
+        tristate "Drivers for the Teranetics PHYs"
+        ---help---
+          Currently supports the Teranetics TN2020
+
 config SMSC_PHY
        tristate "Drivers for SMSC PHYs"
        ---help---
          Currently supports the LAN83C185, LAN8187 and LAN8700 PHYs
 
+config BCM_NET_PHYLIB
+       tristate
+
 config BROADCOM_PHY
        tristate "Drivers for Broadcom PHYs"
+       select BCM_NET_PHYLIB
        ---help---
          Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,
          BCM5481 and BCM5482 PHYs.
 
+config BCM_CYGNUS_PHY
+       tristate "Drivers for Broadcom Cygnus SoC internal PHY"
+       depends on ARCH_BCM_CYGNUS || COMPILE_TEST
+       depends on MDIO_BCM_IPROC
+       select BCM_NET_PHYLIB
+       ---help---
+         This PHY driver is for the 1G internal PHYs of the Broadcom
+         Cygnus Family SoC.
+
+         Currently supports internal PHY's used in the BCM11300,
+         BCM11320, BCM11350, BCM11360, BCM58300, BCM58302,
+         BCM58303 & BCM58305 Broadcom Cygnus SoCs.
+
 config BCM63XX_PHY
        tristate "Drivers for Broadcom 63xx SOCs internal PHY"
        depends on BCM63XX
+       select BCM_NET_PHYLIB
        ---help---
          Currently supports the 6348 and 6358 PHYs.
 
 config BCM7XXX_PHY
        tristate "Drivers for Broadcom 7xxx SOCs internal PHYs"
+       select BCM_NET_PHYLIB
        ---help---
          Currently supports the BCM7366, BCM7439, BCM7445, and
          40nm and 65nm generation of BCM7xxx Set Top Box SoCs.
@@ -119,6 +141,21 @@ config MICREL_PHY
        ---help---
          Supports the KSZ9021, VSC8201, KS8001 PHYs.
 
+config DP83848_PHY
+       tristate "Driver for Texas Instruments DP83848 PHY"
+       ---help---
+         Supports the DP83848 PHY.
+
+config DP83867_PHY
+       tristate "Drivers for Texas Instruments DP83867 Gigabit PHY"
+       ---help---
+         Currently supports the DP83867 PHY.
+
+config MICROCHIP_PHY
+       tristate "Drivers for Microchip PHYs"
+       help
+         Supports the LAN88XX PHYs.
+
 config FIXED_PHY
        tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
        depends on PHYLIB
@@ -147,15 +184,13 @@ config MDIO_GPIO
          will be called mdio-gpio.
 
 config MDIO_OCTEON
-       tristate "Support for MDIO buses on Octeon SOCs"
-       depends on CAVIUM_OCTEON_SOC
-       default y
+       tristate "Support for MDIO buses on Octeon and ThunderX SOCs"
+       depends on 64BIT
        help
 
-         This module provides a driver for the Octeon MDIO busses.
-         It is required by the Octeon Ethernet device drivers.
-
-         If in doubt, say Y.
+         This module provides a driver for the Octeon and ThunderX MDIO
+         busses. It is required by the Octeon and ThunderX ethernet device
+         drivers.
 
 config MDIO_SUN4I
        tristate "Allwinner sun4i MDIO interface support"
@@ -193,7 +228,7 @@ config MDIO_BUS_MUX_GPIO
 
 config MDIO_BUS_MUX_MMIOREG
        tristate "Support for MMIO device-controlled MDIO bus multiplexers"
-       depends on OF_MDIO
+       depends on OF_MDIO && HAS_IOMEM
        select MDIO_BUS_MUX
        help
          This module provides a driver for MDIO bus multiplexers that
@@ -213,6 +248,14 @@ config MDIO_BCM_UNIMAC
          controllers as well as some Broadcom Ethernet switches such as the
          Starfighter 2 switches.
 
+config MDIO_BCM_IPROC
+       tristate "Broadcom iProc MDIO bus controller"
+       depends on ARCH_BCM_IPROC || COMPILE_TEST
+       depends on HAS_IOMEM && OF_MDIO
+       help
+         This module provides a driver for the MDIO busses found in the
+         Broadcom iProc SoC's.
+
 endif # PHYLIB
 
 config MICREL_KS8995MA