phylib: rename mdio-ofgpio to mdio-gpio

[safe/jmp/linux-2.6] / drivers / net / phy / Kconfig

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index f994f12..0318077 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -2,82 +2,92 @@
 # PHY Layer Configuration
 #
 
-menu "PHY device support"
-
-config PHYLIB
+menuconfig PHYLIB
        tristate "PHY Device support and infrastructure"
-       depends on NET_ETHERNET && (BROKEN || !S390)
+       depends on !S390
+       depends on NET_ETHERNET
        help
          Ethernet controllers are usually attached to PHY
          devices.  This option provides infrastructure for
          managing PHY devices.
 
+if PHYLIB
+
 comment "MII PHY device drivers"
-       depends on PHYLIB
 
 config MARVELL_PHY
        tristate "Drivers for Marvell PHYs"
-       depends on PHYLIB
        ---help---
          Currently has a driver for the 88E1011S
        
 config DAVICOM_PHY
        tristate "Drivers for Davicom PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports dm9161e and dm9131
 
 config QSEMI_PHY
        tristate "Drivers for Quality Semiconductor PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the qs6612
 
 config LXT_PHY
        tristate "Drivers for the Intel LXT PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the lxt970, lxt971
 
 config CICADA_PHY
        tristate "Drivers for the Cicada PHYs"
-       depends on PHYLIB
        ---help---
          Currently supports the cis8204
+
 config VITESSE_PHY
         tristate "Drivers for the Vitesse PHYs"
-        depends on PHYLIB
         ---help---
           Currently supports the vsc8244
 
 config SMSC_PHY
        tristate "Drivers for SMSC PHYs"
-       depends on PHYLIB
        ---help---
-         Currently supports the LAN83C185 PHY
+         Currently supports the LAN83C185, LAN8187 and LAN8700 PHYs
 
 config BROADCOM_PHY
        tristate "Drivers for Broadcom PHYs"
-       depends on PHYLIB
        ---help---
-         Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
+         Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481
+         and BCM5482 PHYs.
+
+config ICPLUS_PHY
+       tristate "Drivers for ICPlus PHYs"
+       ---help---
+         Currently supports the IP175C PHY.
+
+config REALTEK_PHY
+       tristate "Drivers for Realtek PHYs"
+       ---help---
+         Supports the Realtek 821x PHY.
 
 config FIXED_PHY
-       tristate "Drivers for PHY emulation on fixed speed/link"
-       depends on PHYLIB
+       bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+       depends on PHYLIB=y
        ---help---
-         Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
-         but with the ability to manipulate the speed/link in software. The relevant MII
-         speed/duplex parameters could be effectively handled in a user-specified function.
-         Currently tested with mpc866ads.
+         Adds the platform "fixed" MDIO Bus to cover the boards that use
+         PHYs that are not connected to the real MDIO bus.
 
-config FIXED_MII_10_FDX
-       bool "Emulation for 10M Fdx fixed PHY behavior"
-       depends on FIXED_PHY
+         Currently tested with mpc866ads and mpc8349e-mitx.
 
-config FIXED_MII_100_FDX
-       bool "Emulation for 100M Fdx fixed PHY behavior"
-       depends on FIXED_PHY
+config MDIO_BITBANG
+       tristate "Support for bitbanged MDIO buses"
+       help
+         This module implements the MDIO bus protocol in software,
+         for use by low level drivers that export the ability to
+         drive the relevant pins.
 
-endmenu
+         If in doubt, say N.
+
+config MDIO_GPIO
+       tristate "Support for GPIO lib-based bitbanged MDIO buses"
+       depends on MDIO_BITBANG && OF_GPIO
+       ---help---
+         Supports GPIO lib-based MDIO busses.
 
+endif # PHYLIB