From f31721e174ce5a585785e2800fb6ff6d7496682f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 6 May 2012 17:08:30 +0000
Subject: atheros: update to 3.3.4 (based on work by acoul), fix mvswitch
 driver for newer kernels

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31625 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches-3.3/220-enet_micrel_workaround.patch   | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch

(limited to 'target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch')

diff --git a/target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch
new file mode 100644
index 000000000..3536552e9
--- /dev/null
+++ b/target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch
@@ -0,0 +1,69 @@
+--- a/drivers/net/ethernet/ar231x/ar231x.c
++++ b/drivers/net/ethernet/ar231x/ar231x.c
+@@ -151,6 +151,7 @@ static int ar231x_mdiobus_write(struct m
+ static int ar231x_mdiobus_reset(struct mii_bus *bus);
+ static int ar231x_mdiobus_probe (struct net_device *dev);
+ static void ar231x_adjust_link(struct net_device *dev);
++static bool no_phy = false;
+ 
+ #ifndef ERR
+ #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
+@@ -300,6 +301,21 @@ int __devinit ar231x_probe(struct platfo
+ 
+ 	mdiobus_register(sp->mii_bus);
+ 
++	/* Workaround for Micrel switch, which is only available on
++	 * one PHY and cannot be configured through MDIO */
++	if (!no_phy) {
++		u32 phy_id = 0;
++		get_phy_id(sp->mii_bus, 1, &phy_id);
++		if (phy_id == 0x00221450)
++			no_phy = true;
++	}
++	if (no_phy) {
++		sp->link = 1;
++		netif_carrier_on(dev);
++		return 0;
++	}
++	no_phy = true;
++
+ 	if (ar231x_mdiobus_probe(dev) != 0) {
+ 		printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
+ 		rx_tasklet_cleanup(dev);
+@@ -356,8 +372,10 @@ static int __devexit ar231x_remove(struc
+ 	rx_tasklet_cleanup(dev);
+ 	ar231x_init_cleanup(dev);
+ 	unregister_netdev(dev);
+-	mdiobus_unregister(sp->mii_bus);
+-	mdiobus_free(sp->mii_bus);
++	if (sp->mii_bus) {
++		mdiobus_unregister(sp->mii_bus);
++		mdiobus_free(sp->mii_bus);
++	}
+ 	kfree(dev);
+ 	return 0;
+ }
+@@ -846,7 +864,12 @@ static int ar231x_rx_int(struct net_devi
+ 				dev->stats.rx_bytes += skb->len;
+ 
+ 				/* pass the packet to upper layers */
+-				sp->rx(skb);
++				if (sp->rx) {
++					sp->rx(skb);
++				} else {
++					skb->protocol = eth_type_trans(skb, skb->dev);
++					netif_rx(skb);
++				}
+ 				skb_new->dev = dev;
+ 
+ 				/* 16 bit align */
+@@ -1142,6 +1165,9 @@ static int ar231x_ioctl(struct net_devic
+ 	struct ar231x_private *sp = netdev_priv(dev);
+ 	int ret;
+ 
++	if (!sp->phy_dev)
++		return -ENODEV;
++
+ 	switch (cmd) {
+ 
+ 	case SIOCETHTOOL:
-- 
cgit v1.2.3