aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-05-09 15:21:58 +0000
committerJohn Crispin <john@openwrt.org>2011-05-09 15:21:58 +0000
commit60c125b8e6f981885d43d5fc06a711cb8972b004 (patch)
tree1d544b0df5d785941381d770726c835eb0dcc6bf /target/linux/generic/patches-2.6.38
parent9b5036a29da50f9eff46ae47d257972119bb1250 (diff)
downloadupstream-60c125b8e6f981885d43d5fc06a711cb8972b004.tar.gz
upstream-60c125b8e6f981885d43d5fc06a711cb8972b004.tar.bz2
upstream-60c125b8e6f981885d43d5fc06a711cb8972b004.zip
(respin) 802.1Q VLAN support for ADM6996M/ADM6996FC
This patch adds 802.1Q VLAN support for the ADM6996M chip. The driver is loaded for both the FC and M model. It will detect which of the two chips is connected. The FC model is initialised, but no further functionality is offered. The PHY driver will always report "100 Mbit/s, link up", for both the M and FC models. This reflects the fact that the link between switch chip and Ethernet MAC is always on[1]. Further documentation can be found in the kernel's Documentation/networking/adm6996.txt Signed-of-By: Peter Lebbing <peter@digitalbrains.com> SVN-Revision: 26865
Diffstat (limited to 'target/linux/generic/patches-2.6.38')
-rw-r--r--target/linux/generic/patches-2.6.38/720-phy_adm6996.patch6
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.38/720-phy_adm6996.patch b/target/linux/generic/patches-2.6.38/720-phy_adm6996.patch
index 8e0ef559a8..9e8e56678b 100644
--- a/target/linux/generic/patches-2.6.38/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-2.6.38/720-phy_adm6996.patch
@@ -1,13 +1,15 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -98,6 +98,11 @@ config MICREL_PHY
+@@ -98,6 +98,13 @@ config MICREL_PHY
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
+config ADM6996_PHY
+ tristate "Driver for ADM6996 switches"
++ select SWCONFIG
+ ---help---
-+ Currently supports the ADM6996F switch
++ Currently supports the ADM6996FC and ADM6996M switches.
++ Support for FC is very limited.
+
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"