aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
blob: 62c64baef3018a4eae85da97a02b0cf0a38fbcc2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Index: linux-2.6.25.4/drivers/net/phy/Kconfig
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Kconfig
+++ linux-2.6.25.4/drivers/net/phy/Kconfig
@@ -70,6 +70,12 @@ config ADM6996_PHY
 	---help---
 	  Currently supports the ADM6996F switch
 
+config MVSWITCH_PHY
+	tristate "Driver for Marvell switches"
+	select VLAN_8021Q
+	---help---
+	  Currently supports the Marvell 88E6060 switch.
+
 config FIXED_PHY
 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
 	depends on PHYLIB=y
Index: linux-2.6.25.4/drivers/net/phy/Makefile
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/Makefile
+++ linux-2.6.25.4/drivers/net/phy/Makefile
@@ -13,6 +13,7 @@ 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_MVSWITCH_PHY)	+= mvswitch.o
 obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
 obj-$(CONFIG_FIXED_PHY)		+= fixed.o
 obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o
Index: linux-2.6.25.4/drivers/net/phy/mdio_bus.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/phy/mdio_bus.c
+++ linux-2.6.25.4/drivers/net/phy/mdio_bus.c
@@ -35,6 +35,12 @@
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
+static void mdio_dev_release(struct device *dev)
+{
+	/* nothing to do */
+}
+
+
 /**
  * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
  * @bus: target mii_bus
@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
 
 			phydev->dev.parent = bus->dev;
 			phydev->dev.bus = &mdio_bus_type;
+			phydev->dev.release = mdio_dev_release;
 			snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, i);
 
 			phydev->bus = bus;