From 6460fbce70e353a8e8221b1655139793377d9068 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 10 Mar 2013 13:24:42 +0000 Subject: atheros: remove 3.3 support Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35926 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.3/220-enet_micrel_workaround.patch | 55 ---------------------- 1 file changed, 55 deletions(-) delete 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 deleted file mode 100644 index 56c7cd545..000000000 --- a/target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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; - } -@@ -1133,6 +1151,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