From patchwork Thu Feb 19 01:25:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Olivari X-Patchwork-Id: 441516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0506914008F for ; Thu, 19 Feb 2015 12:27:12 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4842028C182; Thu, 19 Feb 2015 02:25:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 92E4828C174 for ; Thu, 19 Feb 2015 02:25:12 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 19 Feb 2015 02:25:12 +0100 (CET) Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id E2A5E140778; Thu, 19 Feb 2015 01:25:14 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id D567F14077C; Thu, 19 Feb 2015 01:25:14 +0000 (UTC) Received: from mathieu-linux.qualcomm.com (qf-scl1nat.qualcomm.com [207.114.132.30]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mathieu@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3B1A9140778; Thu, 19 Feb 2015 01:25:11 +0000 (UTC) From: Mathieu Olivari To: blogic@openwrt.org, hkallweit1@gmail.com, nbd@openwrt.org Date: Wed, 18 Feb 2015 17:25:04 -0800 Message-Id: <1424309105-31642-2-git-send-email-mathieu@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424309105-31642-1-git-send-email-mathieu@codeaurora.org> References: <1424309105-31642-1-git-send-email-mathieu@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH 1/2] kernel: rename ar8216.ko into ar8xxx.ko X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- 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 diff --git a/target/linux/ar71xx/config-3.14 b/target/linux/ar71xx/config-3.14 index b78d4d2..c6f4c70 100644 --- a/target/linux/ar71xx/config-3.14 +++ b/target/linux/ar71xx/config-3.14 @@ -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 diff --git a/target/linux/atheros/config-3.14 b/target/linux/atheros/config-3.14 index cf64454..7fc2049 100644 --- a/target/linux/atheros/config-3.14 +++ b/target/linux/atheros/config-3.14 @@ -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 diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10 index 4299c57..6f4c333 100644 --- a/target/linux/generic/config-3.10 +++ b/target/linux/generic/config-3.10 @@ -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 diff --git a/target/linux/generic/config-3.13 b/target/linux/generic/config-3.13 index 8dff7e1..278b55f 100644 --- a/target/linux/generic/config-3.13 +++ b/target/linux/generic/config-3.13 @@ -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 diff --git a/target/linux/generic/config-3.14 b/target/linux/generic/config-3.14 index 6e70ba7..f5f3d64 100644 --- a/target/linux/generic/config-3.14 +++ b/target/linux/generic/config-3.14 @@ -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 diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18 index e8ae342..cb032de 100644 --- a/target/linux/generic/config-3.18 +++ b/target/linux/generic/config-3.18 @@ -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 diff --git a/target/linux/generic/config-3.19 b/target/linux/generic/config-3.19 index ae4030a..976076b 100644 --- a/target/linux/generic/config-3.19 +++ b/target/linux/generic/config-3.19 @@ -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 diff --git a/target/linux/generic/config-3.8 b/target/linux/generic/config-3.8 index 343c0dd..e81ce81 100644 --- a/target/linux/generic/config-3.8 +++ b/target/linux/generic/config-3.8 @@ -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 diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.c b/target/linux/generic/files/drivers/net/phy/ar8327.c index 07e837e..15bd41f 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8327.c +++ b/target/linux/generic/files/drivers/net/phy/ar8327.c @@ -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++) { diff --git a/target/linux/generic/patches-3.10/724-phy_ar8216.patch b/target/linux/generic/patches-3.10/724-phy_ar8216.patch deleted file mode 100644 index 08e5983..0000000 --- a/target/linux/generic/patches-3.10/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.10/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.10/724-phy_ar8xxx.patch new file mode 100644 index 0000000..b5e3243 --- /dev/null +++ b/target/linux/generic/patches-3.10/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.10/725-phy_rtl8306.patch b/target/linux/generic/patches-3.10/725-phy_rtl8306.patch index cd4808f..7695b90 100644 --- a/target/linux/generic/patches-3.10/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.10/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.10/726-phy_rtl8366.patch b/target/linux/generic/patches-3.10/726-phy_rtl8366.patch index 09ccc43..ad9f3e3 100644 --- a/target/linux/generic/patches-3.10/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.10/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/generic/patches-3.13/724-phy_ar8216.patch b/target/linux/generic/patches-3.13/724-phy_ar8216.patch deleted file mode 100644 index 08e5983..0000000 --- a/target/linux/generic/patches-3.13/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.13/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.13/724-phy_ar8xxx.patch new file mode 100644 index 0000000..c84f8cc --- /dev/null +++ b/target/linux/generic/patches-3.13/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.13/725-phy_rtl8306.patch b/target/linux/generic/patches-3.13/725-phy_rtl8306.patch index cd4808f..7695b90 100644 --- a/target/linux/generic/patches-3.13/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.13/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.13/726-phy_rtl8366.patch b/target/linux/generic/patches-3.13/726-phy_rtl8366.patch index 60efd82..aa9e060 100644 --- a/target/linux/generic/patches-3.13/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.13/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/generic/patches-3.14/724-phy_ar8216.patch b/target/linux/generic/patches-3.14/724-phy_ar8216.patch deleted file mode 100644 index 08e5983..0000000 --- a/target/linux/generic/patches-3.14/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.14/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.14/724-phy_ar8xxx.patch new file mode 100644 index 0000000..c84f8cc --- /dev/null +++ b/target/linux/generic/patches-3.14/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.14/725-phy_rtl8306.patch b/target/linux/generic/patches-3.14/725-phy_rtl8306.patch index cd4808f..7695b90 100644 --- a/target/linux/generic/patches-3.14/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.14/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.14/726-phy_rtl8366.patch b/target/linux/generic/patches-3.14/726-phy_rtl8366.patch index 60efd82..aa9e060 100644 --- a/target/linux/generic/patches-3.14/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.14/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/generic/patches-3.14/733-phy_mvsw61xx.patch b/target/linux/generic/patches-3.14/733-phy_mvsw61xx.patch index 45dd4c6..a051d4d 100644 --- a/target/linux/generic/patches-3.14/733-phy_mvsw61xx.patch +++ b/target/linux/generic/patches-3.14/733-phy_mvsw61xx.patch @@ -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 diff --git a/target/linux/generic/patches-3.18/724-phy_ar8216.patch b/target/linux/generic/patches-3.18/724-phy_ar8216.patch deleted file mode 100644 index acb2df8..0000000 --- a/target/linux/generic/patches-3.18/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.18/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.18/724-phy_ar8xxx.patch new file mode 100644 index 0000000..f8f5698 --- /dev/null +++ b/target/linux/generic/patches-3.18/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.18/725-phy_rtl8306.patch b/target/linux/generic/patches-3.18/725-phy_rtl8306.patch index 78ac6ce..6b9522f 100644 --- a/target/linux/generic/patches-3.18/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.18/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.18/726-phy_rtl8366.patch b/target/linux/generic/patches-3.18/726-phy_rtl8366.patch index 4a4a4ac..6a0127a 100644 --- a/target/linux/generic/patches-3.18/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.18/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch b/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch deleted file mode 100644 index c753967..0000000 --- a/target/linux/generic/patches-3.18/732-phy-ar8216-led-support.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.18/732-phy-ar8xxx-led-support.patch b/target/linux/generic/patches-3.18/732-phy-ar8xxx-led-support.patch new file mode 100644 index 0000000..e068ff6 --- /dev/null +++ b/target/linux/generic/patches-3.18/732-phy-ar8xxx-led-support.patch @@ -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 diff --git a/target/linux/generic/patches-3.18/733-phy_mvsw61xx.patch b/target/linux/generic/patches-3.18/733-phy_mvsw61xx.patch index 041d168..f9faa65 100644 --- a/target/linux/generic/patches-3.18/733-phy_mvsw61xx.patch +++ b/target/linux/generic/patches-3.18/733-phy_mvsw61xx.patch @@ -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 diff --git a/target/linux/generic/patches-3.19/724-phy_ar8216.patch b/target/linux/generic/patches-3.19/724-phy_ar8216.patch deleted file mode 100644 index 37602fa..0000000 --- a/target/linux/generic/patches-3.19/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.19/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.19/724-phy_ar8xxx.patch new file mode 100644 index 0000000..2b63bac --- /dev/null +++ b/target/linux/generic/patches-3.19/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.19/725-phy_rtl8306.patch b/target/linux/generic/patches-3.19/725-phy_rtl8306.patch index af6083b..c6ba16f 100644 --- a/target/linux/generic/patches-3.19/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.19/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.19/726-phy_rtl8366.patch b/target/linux/generic/patches-3.19/726-phy_rtl8366.patch index 3213f1e..fa04154 100644 --- a/target/linux/generic/patches-3.19/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.19/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/generic/patches-3.19/733-phy_mvsw61xx.patch b/target/linux/generic/patches-3.19/733-phy_mvsw61xx.patch index 041d168..f9faa65 100644 --- a/target/linux/generic/patches-3.19/733-phy_mvsw61xx.patch +++ b/target/linux/generic/patches-3.19/733-phy_mvsw61xx.patch @@ -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 diff --git a/target/linux/generic/patches-3.8/724-phy_ar8216.patch b/target/linux/generic/patches-3.8/724-phy_ar8216.patch deleted file mode 100644 index aab6b08..0000000 --- a/target/linux/generic/patches-3.8/724-phy_ar8216.patch +++ /dev/null @@ -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 diff --git a/target/linux/generic/patches-3.8/724-phy_ar8xxx.patch b/target/linux/generic/patches-3.8/724-phy_ar8xxx.patch new file mode 100644 index 0000000..04fdda7 --- /dev/null +++ b/target/linux/generic/patches-3.8/724-phy_ar8xxx.patch @@ -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 diff --git a/target/linux/generic/patches-3.8/725-phy_rtl8306.patch b/target/linux/generic/patches-3.8/725-phy_rtl8306.patch index c2fab41..cb63ee5 100644 --- a/target/linux/generic/patches-3.8/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.8/725-phy_rtl8306.patch @@ -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 diff --git a/target/linux/generic/patches-3.8/726-phy_rtl8366.patch b/target/linux/generic/patches-3.8/726-phy_rtl8366.patch index 6bfcf55..ca4b80b 100644 --- a/target/linux/generic/patches-3.8/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.8/726-phy_rtl8366.patch @@ -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 diff --git a/target/linux/lantiq/xrx200/config-3.14 b/target/linux/lantiq/xrx200/config-3.14 index 3d525a4..c6803fc 100644 --- a/target/linux/lantiq/xrx200/config-3.14 +++ b/target/linux/lantiq/xrx200/config-3.14 @@ -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 diff --git a/target/linux/lantiq/xrx200/config-default b/target/linux/lantiq/xrx200/config-default index 110be3d..107148d 100644 --- a/target/linux/lantiq/xrx200/config-default +++ b/target/linux/lantiq/xrx200/config-default @@ -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 diff --git a/target/linux/lantiq/xway/config-3.14 b/target/linux/lantiq/xway/config-3.14 index d7f7c39..852934d 100644 --- a/target/linux/lantiq/xway/config-3.14 +++ b/target/linux/lantiq/xway/config-3.14 @@ -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 diff --git a/target/linux/lantiq/xway/config-default b/target/linux/lantiq/xway/config-default index eec9674..93210b1 100644 --- a/target/linux/lantiq/xway/config-default +++ b/target/linux/lantiq/xway/config-default @@ -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 diff --git a/target/linux/mpc85xx/config-3.14 b/target/linux/mpc85xx/config-3.14 index ce85449..90bbbeb 100644 --- a/target/linux/mpc85xx/config-3.14 +++ b/target/linux/mpc85xx/config-3.14 @@ -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 diff --git a/target/linux/ramips/rt3883/config-3.18 b/target/linux/ramips/rt3883/config-3.18 index e5ab48d..f3c752c 100644 --- a/target/linux/ramips/rt3883/config-3.18 +++ b/target/linux/ramips/rt3883/config-3.18 @@ -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