summaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 13:24:42 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 13:24:42 +0000
commit6460fbce70e353a8e8221b1655139793377d9068 (patch)
tree040c072a36bedf9f91d7bcbd642ff7f34ffc51fc /target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch
parent4a174880f87843473fddc8626a250e04055b8c3d (diff)
atheros: remove 3.3 support
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35926 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch')
-rw-r--r--target/linux/atheros/patches-3.3/220-enet_micrel_workaround.patch55
1 files changed, 0 insertions, 55 deletions
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: