diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 90ec7c7f127fa89473cec12a91b8874f9c8d6a34..3334d5440a66a82c848c0c47efe421bae33558f8 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -210,6 +210,89 @@ config LED_TRIGGER_PHY for any speed known to the PHY. +comment "Switch configuration API + drivers" + +config SWCONFIG + tristate "Switch configuration API" + ---help--- + Switch configuration API using netlink. This allows + you to configure the VLAN features of certain switches. + +config SWCONFIG_LEDS + bool "Switch LED trigger support" + depends on (SWCONFIG && LEDS_TRIGGERS) + +config ADM6996_PHY + tristate "Driver for ADM6996 switches" + select SWCONFIG + ---help--- + Currently supports the ADM6996FC and ADM6996M switches. + Support for FC is very limited. + +config AR8216_PHY + tristate "Driver for Atheros AR8216 switches" + select ETHERNET_PACKET_MANGLE + select SWCONFIG + +config AR8216_PHY_LEDS + bool "Atheros AR8216 switch LED support" + depends on (AR8216_PHY && LEDS_CLASS) + +source "drivers/net/phy/b53/Kconfig" + +config IP17XX_PHY + tristate "Driver for IC+ IP17xx switches" + select SWCONFIG + +config MVSWITCH_PHY + tristate "Driver for Marvell 88E6060 switches" + select ETHERNET_PACKET_MANGLE + +config MVSW61XX_PHY + tristate "Driver for Marvell 88E6171/6172 switches" + select SWCONFIG + +config PSB6970_PHY + tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch" + select SWCONFIG + select ETHERNET_PACKET_MANGLE + +config RTL8306_PHY + tristate "Driver for Realtek RTL8306S switches" + select SWCONFIG + +config RTL8366_SMI + tristate "Driver for the RTL8366 SMI interface" + depends on GPIOLIB + ---help--- + This module implements the SMI interface protocol which is used + by some RTL8366 ethernet switch devices via the generic GPIO API. + +if RTL8366_SMI + +config RTL8366_SMI_DEBUG_FS + bool "RTL8366 SMI interface debugfs support" + depends on DEBUG_FS + default n + +config RTL8366S_PHY + tristate "Driver for the Realtek RTL8366S switch" + select SWCONFIG + +config RTL8366RB_PHY + tristate "Driver for the Realtek RTL8366RB switch" + select SWCONFIG + +config RTL8367_PHY + tristate "Driver for the Realtek RTL8367R/M switches" + select SWCONFIG + +config RTL8367B_PHY + tristate "Driver fot the Realtek RTL8367R-VB switch" + select SWCONFIG + +endif # RTL8366_SMI + comment "MII PHY device drivers" config SFP diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index 8089e6a8486f51071cfc0d5c3c287c6258ce48ff..1fa78855157b36a65917ed4f199fed5b9cd04067 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -22,6 +22,21 @@ libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_led_triggers.o obj-$(CONFIG_PHYLINK) += phylink.o obj-$(CONFIG_PHYLIB) += libphy.o +obj-$(CONFIG_SWCONFIG) += swconfig.o +obj-$(CONFIG_ADM6996_PHY) += adm6996.o +obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o +obj-$(CONFIG_SWCONFIG_B53) += b53/ +obj-$(CONFIG_IP17XX_PHY) += ip17xx.o +obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o +obj-$(CONFIG_MVSW61XX_PHY) += mvsw61xx.o +obj-$(CONFIG_PSB6970_PHY) += psb6970.o +obj-$(CONFIG_RTL8306_PHY) += rtl8306.o +obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o +obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o +obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o +obj-$(CONFIG_RTL8367_PHY) += rtl8367.o +obj-$(CONFIG_RTL8367B_PHY) += rtl8367b.o + obj-$(CONFIG_MDIO_BCM_IPROC) += mdio-bcm-iproc.o obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o diff --git a/include/linux/platform_data/b53.h b/include/linux/platform_data/b53.h index 8eaef2f2b691e7f98a050ace421428c2afb69e8d..a5a9138ce9158bf374730344676bd988c1d52401 100644 --- a/include/linux/platform_data/b53.h +++ b/include/linux/platform_data/b53.h @@ -29,6 +29,9 @@ struct b53_platform_data { u32 chip_id; u16 enabled_ports; + /* allow to specify an ethX alias */ + const char *alias; + /* only used by MMAP'd driver */ unsigned big_endian:1; void __iomem *regs;