@@ -2,7 +2,7 @@ CONFIG_AG71XX=y
CONFIG_AG71XX_AR8216_SUPPORT=y
# CONFIG_AG71XX_DEBUG is not set
# CONFIG_AG71XX_DEBUG_FS is not set
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
@@ -1,6 +1,6 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR2315_WDT=y
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
@@ -108,8 +108,8 @@ CONFIG_ANON_INODES=y
# CONFIG_APM8018X is not set
# CONFIG_APPLICOM is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_AR8XXX_PHY is not set
+# CONFIG_AR8XXX_PHY_LEDS is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM2835 is not set
# CONFIG_ARCH_BCMRING is not set
@@ -114,8 +114,8 @@ CONFIG_ANON_INODES=y
# CONFIG_APPLICOM is not set
# CONFIG_AR5523 is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_AR8XXX_PHY is not set
+# CONFIG_AR8XXX_PHY_LEDS is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
@@ -115,8 +115,8 @@ CONFIG_ANON_INODES=y
# CONFIG_APPLICOM is not set
# CONFIG_AR5523 is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_AR8XXX_PHY is not set
+# CONFIG_AR8XXX_PHY_LEDS is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
@@ -124,8 +124,8 @@ CONFIG_ANON_INODES=y
# CONFIG_APPLICOM is not set
# CONFIG_AR5523 is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_AR8XXX_PHY is not set
+# CONFIG_AR8XXX_PHY_LEDS is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
@@ -124,8 +124,8 @@ CONFIG_ANON_INODES=y
# CONFIG_APPLICOM is not set
# CONFIG_AR5523 is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
-# CONFIG_AR8216_PHY_LEDS is not set
+# CONFIG_AR8XXX_PHY is not set
+# CONFIG_AR8XXX_PHY_LEDS is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
@@ -106,7 +106,7 @@ CONFIG_ANON_INODES=y
# CONFIG_APM8018X is not set
# CONFIG_APPLICOM is not set
# CONFIG_AR7 is not set
-# CONFIG_AR8216_PHY is not set
+# CONFIG_AR8XXX_PHY is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_BCM2835 is not set
# CONFIG_ARCH_BCMRING is not set
@@ -394,7 +394,7 @@ ar8327_led_create(struct ar8xxx_priv *priv,
struct ar8327_led *aled;
int ret;
- if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+ if (!IS_ENABLED(CONFIG_AR8XXX_PHY_LEDS))
return 0;
if (!led_info->name)
@@ -454,7 +454,7 @@ ar8327_leds_init(struct ar8xxx_priv *priv)
struct ar8327_data *data = priv->chip_data;
unsigned i;
- if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+ if (!IS_ENABLED(CONFIG_AR8XXX_PHY_LEDS))
return;
for (i = 0; i < data->num_leds; i++) {
@@ -477,7 +477,7 @@ ar8327_leds_cleanup(struct ar8xxx_priv *priv)
struct ar8327_data *data = priv->chip_data;
unsigned i;
- if (!IS_ENABLED(CONFIG_AR8216_PHY_LEDS))
+ if (!IS_ENABLED(CONFIG_AR8XXX_PHY_LEDS))
return;
for (i = 0; i < data->num_leds; i++) {
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,6 +135,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8216 switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -36,3 +37,5 @@ obj-$(CONFIG_AMD_PHY) += amd.o
+ obj-$(CONFIG_MDIO_BUS_MUX) += mdio-mux.o
+ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o
+ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -16,7 +16,7 @@
@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,6 +135,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8XXX switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -38,3 +39,5 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-
+ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
+ obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o
+ obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -16,7 +16,7 @@
@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -135,6 +135,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -135,6 +135,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8XXX switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -38,3 +39,5 @@ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-
+ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
+ obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o
+ obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -16,7 +16,7 @@
@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
@@ -20,4 +20,4 @@
+obj-$(CONFIG_MVSW61XX_PHY) += mvsw61xx.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8216.o ar8327.o
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -147,6 +147,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -147,6 +147,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8XXX switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -41,3 +42,5 @@ obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o
+ obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
+ obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy.o
+ obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -152,6 +152,10 @@ config AR8216_PHY
+@@ -152,6 +152,10 @@ config AR8XXX_PHY
select ETHERNET_PACKET_MANGLE
select SWCONFIG
@@ -16,7 +16,7 @@
@@ -23,6 +23,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -24,6 +24,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
deleted file mode 100644
@@ -1,13 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -152,6 +152,10 @@ config AR8216_PHY
- select ETHERNET_PACKET_MANGLE
- select SWCONFIG
-
-+config AR8216_PHY_LEDS
-+ bool "Atheros AR8216 switch LED support"
-+ depends on (AR8216_PHY && LEDS_CLASS)
-+
- config RTL8306_PHY
- tristate "Driver for Realtek RTL8306S switches"
- select SWCONFIG
new file mode 100644
@@ -0,0 +1,13 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -152,6 +152,10 @@ config AR8XXX_PHY
+ select ETHERNET_PACKET_MANGLE
+ select SWCONFIG
+
++config AR8XXX_PHY_LEDS
++ bool "Atheros AR8xxx switch LED support"
++ depends on (AR8XXX_PHY && LEDS_CLASS)
++
+ config RTL8306_PHY
+ tristate "Driver for Realtek RTL8306S switches"
+ select SWCONFIG
@@ -20,4 +20,4 @@
+obj-$(CONFIG_MVSW61XX_PHY) += mvsw61xx.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8216.o ar8327.o
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -147,6 +147,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed_phy.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -147,6 +147,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8XXX switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -22,6 +22,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed_phy.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -41,3 +42,5 @@ obj-$(CONFIG_MDIO_SUN4I) += mdio-sun4i.o
+ obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o
+ obj-$(CONFIG_AMD_XGBE_PHY) += amd-xgbe-phy.o
+ obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -16,7 +16,7 @@
@@ -23,6 +23,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed_phy.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -24,6 +24,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
@@ -20,4 +20,4 @@
+obj-$(CONFIG_MVSW61XX_PHY) += mvsw61xx.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8216.o ar8327.o
deleted file mode 100644
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -136,6 +136,11 @@ config IP17XX_PHY
- tristate "Driver for IC+ IP17xx switches"
- select SWCONFIG
-
-+config AR8216_PHY
-+ tristate "Driver for Atheros AR8216 switches"
-+ select ETHERNET_PACKET_MANGLE
-+ select SWCONFIG
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
- obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
-+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
new file mode 100644
@@ -0,0 +1,30 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -136,6 +136,11 @@ config IP17XX_PHY
+ tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG
+
++config AR8XXX_PHY
++ tristate "Driver for Atheros AR8XXX switches"
++ select ETHERNET_PACKET_MANGLE
++ select SWCONFIG
++
+ config FIXED_PHY
+ bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ depends on PHYLIB=y
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
++obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o
+ obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
+@@ -36,3 +37,5 @@ obj-$(CONFIG_AMD_PHY) += amd.o
+ obj-$(CONFIG_MDIO_BUS_MUX) += mdio-mux.o
+ obj-$(CONFIG_MDIO_BUS_MUX_GPIO) += mdio-mux-gpio.o
+ obj-$(CONFIG_MDIO_BUS_MUX_MMIOREG) += mdio-mux-mmioreg.o
++
++ar8xxx-objs := ar8216.o ar8327.o
@@ -16,7 +16,7 @@
@@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
@@ -35,7 +35,7 @@
+++ b/drivers/net/phy/Makefile
@@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+ obj-$(CONFIG_AR8XXX_PHY) += ar8xxx.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o
+obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
@@ -1,5 +1,5 @@
CONFIG_ADM6996_PHY=y
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
CONFIG_CLONE_BACKWARDS=y
@@ -1,5 +1,5 @@
CONFIG_ADM6996_PHY=y
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
# CONFIG_ARCH_HAS_SG_CHAIN is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
@@ -1,5 +1,5 @@
CONFIG_ADM6996_PHY=y
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
CONFIG_CLONE_BACKWARDS=y
@@ -1,5 +1,5 @@
CONFIG_ADM6996_PHY=y
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
# CONFIG_ARCH_HAS_SG_CHAIN is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
@@ -1,8 +1,8 @@
# CONFIG_40x is not set
# CONFIG_44x is not set
# CONFIG_ADVANCED_OPTIONS is not set
-CONFIG_AR8216_PHY=y
-CONFIG_AR8216_PHY_LEDS=y
+CONFIG_AR8XXX_PHY=y
+CONFIG_AR8XXX_PHY_LEDS=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
@@ -1,4 +1,4 @@
-CONFIG_AR8216_PHY=y
+CONFIG_AR8XXX_PHY=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
ar8216 driver can no longer be built as a loadable kernel module, since it's been splitted up into 2 pieces (ar8216 and ar8327), and these two pieces are interdependent. This patch is fixing this by renaming the loadable kernel module into ar8xxx.ko, which will include the 2 objects above. In order to keep the option name consistent, we're also renaming the kernel option CONFIG_AR8XXX_PHY, which ends-up propagating the change into the patches-* folders and the different kernel configs. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> --- target/linux/ar71xx/config-3.14 | 2 +- target/linux/atheros/config-3.14 | 2 +- target/linux/generic/config-3.10 | 4 +-- target/linux/generic/config-3.13 | 4 +-- target/linux/generic/config-3.14 | 4 +-- target/linux/generic/config-3.18 | 4 +-- target/linux/generic/config-3.19 | 4 +-- target/linux/generic/config-3.8 | 2 +- .../linux/generic/files/drivers/net/phy/ar8327.c | 6 ++--- .../generic/patches-3.10/724-phy_ar8216.patch | 24 ----------------- .../generic/patches-3.10/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.10/725-phy_rtl8306.patch | 2 +- .../generic/patches-3.10/726-phy_rtl8366.patch | 2 +- .../generic/patches-3.13/724-phy_ar8216.patch | 24 ----------------- .../generic/patches-3.13/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.13/725-phy_rtl8306.patch | 2 +- .../generic/patches-3.13/726-phy_rtl8366.patch | 2 +- .../generic/patches-3.14/724-phy_ar8216.patch | 24 ----------------- .../generic/patches-3.14/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.14/725-phy_rtl8306.patch | 2 +- .../generic/patches-3.14/726-phy_rtl8366.patch | 2 +- .../generic/patches-3.14/733-phy_mvsw61xx.patch | 2 +- .../generic/patches-3.18/724-phy_ar8216.patch | 24 ----------------- .../generic/patches-3.18/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.18/725-phy_rtl8306.patch | 4 +-- .../generic/patches-3.18/726-phy_rtl8366.patch | 2 +- .../patches-3.18/732-phy-ar8216-led-support.patch | 13 ---------- .../patches-3.18/732-phy-ar8xxx-led-support.patch | 13 ++++++++++ .../generic/patches-3.18/733-phy_mvsw61xx.patch | 2 +- .../generic/patches-3.19/724-phy_ar8216.patch | 24 ----------------- .../generic/patches-3.19/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.19/725-phy_rtl8306.patch | 2 +- .../generic/patches-3.19/726-phy_rtl8366.patch | 2 +- .../generic/patches-3.19/733-phy_mvsw61xx.patch | 2 +- .../linux/generic/patches-3.8/724-phy_ar8216.patch | 24 ----------------- .../linux/generic/patches-3.8/724-phy_ar8xxx.patch | 30 ++++++++++++++++++++++ .../generic/patches-3.8/725-phy_rtl8306.patch | 2 +- .../generic/patches-3.8/726-phy_rtl8366.patch | 2 +- target/linux/lantiq/xrx200/config-3.14 | 2 +- target/linux/lantiq/xrx200/config-default | 2 +- target/linux/lantiq/xway/config-3.14 | 2 +- target/linux/lantiq/xway/config-default | 2 +- target/linux/mpc85xx/config-3.14 | 4 +-- target/linux/ramips/rt3883/config-3.18 | 2 +- 44 files changed, 232 insertions(+), 196 deletions(-) delete mode 100644 target/linux/generic/patches-3.10/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.10/724-phy_ar8xxx.patch delete mode 100644 target/linux/generic/patches-3.13/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.13/724-phy_ar8xxx.patch delete mode 100644 target/linux/generic/patches-3.14/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.14/724-phy_ar8xxx.patch delete mode 100644 target/linux/generic/patches-3.18/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.18/724-phy_ar8xxx.patch delete mode 100644 target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch create mode 100644 target/linux/generic/patches-3.18/732-phy-ar8xxx-led-support.patch delete mode 100644 target/linux/generic/patches-3.19/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.19/724-phy_ar8xxx.patch delete mode 100644 target/linux/generic/patches-3.8/724-phy_ar8216.patch create mode 100644 target/linux/generic/patches-3.8/724-phy_ar8xxx.patch