aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.23
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-04-20 02:53:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2008-04-20 02:53:04 +0000
commita323a7bf2a131761180a1ffe01928dc2e7804837 (patch)
tree89fef6ba6d25ffb5ac881b53b2a7db10421af652 /target/linux/generic-2.6/patches-2.6.23
parent27d341022c302a5d12e3cdad035358a20f72e3e1 (diff)
downloadupstream-a323a7bf2a131761180a1ffe01928dc2e7804837.tar.gz
upstream-a323a7bf2a131761180a1ffe01928dc2e7804837.tar.bz2
upstream-a323a7bf2a131761180a1ffe01928dc2e7804837.zip
Add stub driver for ADM6996F switches (configured through MII) The driver currently uses a hardcoded VLAN mapping and has no configuration yet Tested on Accton MR3202a
SVN-Revision: 10869
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.23')
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch30
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch26
2 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch b/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch
new file mode 100644
index 0000000000..394cd3704c
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.23/610-phy_detect.patch
@@ -0,0 +1,30 @@
+Index: linux-2.6.23.16/drivers/net/phy/mdio_bus.c
+===================================================================
+--- linux-2.6.23.16.orig/drivers/net/phy/mdio_bus.c 2008-02-11 07:06:32.000000000 +0100
++++ linux-2.6.23.16/drivers/net/phy/mdio_bus.c 2008-04-20 01:55:46.000000000 +0200
+@@ -131,6 +131,9 @@
+ struct phy_device *phydev = to_phy_device(dev);
+ struct phy_driver *phydrv = to_phy_driver(drv);
+
++ if (phydrv->detect)
++ return (phydrv->detect(phydev->bus, phydev->addr));
++
+ return ((phydrv->phy_id & phydrv->phy_id_mask) ==
+ (phydev->phy_id & phydrv->phy_id_mask));
+ }
+Index: linux-2.6.23.16/include/linux/phy.h
+===================================================================
+--- linux-2.6.23.16.orig/include/linux/phy.h 2008-04-20 00:36:18.000000000 +0200
++++ linux-2.6.23.16/include/linux/phy.h 2008-04-20 01:55:04.000000000 +0200
+@@ -319,6 +319,11 @@
+ u32 features;
+ u32 flags;
+
++ /* Called during discovery to test if the
++ * device can attach to the bus, even if
++ * phy id and mask do not match */
++ bool (*detect)(struct mii_bus *bus, int addr);
++
+ /* Called to initialize the PHY,
+ * including after a reset */
+ int (*config_init)(struct phy_device *phydev);
diff --git a/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch b/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch
new file mode 100644
index 0000000000..299739237b
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.23/620-phy_adm6996.patch
@@ -0,0 +1,26 @@
+Index: linux-2.6.23.16/drivers/net/phy/Kconfig
+===================================================================
+--- linux-2.6.23.16.orig/drivers/net/phy/Kconfig 2008-04-20 04:40:22.000000000 +0200
++++ linux-2.6.23.16/drivers/net/phy/Kconfig 2008-04-20 04:40:32.000000000 +0200
+@@ -60,6 +60,11 @@
+ ---help---
+ Currently supports the IP175C PHY.
+
++config ADM6996_PHY
++ tristate "Driver for ADM6996 switches"
++ ---help---
++ Currently supports the ADM6996F switch
++
+ config FIXED_PHY
+ tristate "Drivers for PHY emulation on fixed speed/link"
+ ---help---
+Index: linux-2.6.23.16/drivers/net/phy/Makefile
+===================================================================
+--- linux-2.6.23.16.orig/drivers/net/phy/Makefile 2008-04-20 04:40:22.000000000 +0200
++++ linux-2.6.23.16/drivers/net/phy/Makefile 2008-04-20 04:40:32.000000000 +0200
+@@ -12,4 +12,5 @@
+ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
+ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
+ obj-$(CONFIG_ICPLUS_PHY) += icplus.o
++obj-$(CONFIG_ADM6996_PHY) += adm6996.o
+ obj-$(CONFIG_FIXED_PHY) += fixed.o