aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-08 11:12:59 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-08 11:12:59 +0000
commitf0872f8b4053e37892411598bbbafcea73b4a82a (patch)
treea1b813aa176648af05ab70ba2a69716bbac0795a /target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch
parentb244e45af012a9714628858b7e4d12fff7b7cada (diff)
downloadupstream-f0872f8b4053e37892411598bbbafcea73b4a82a.tar.gz
upstream-f0872f8b4053e37892411598bbbafcea73b4a82a.tar.bz2
upstream-f0872f8b4053e37892411598bbbafcea73b4a82a.zip
linux/atheros: add preliminary 2.6.37 kernel support (thank you nbd, florian)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23928 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch')
-rw-r--r--target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch
new file mode 100644
index 0000000000..6d0bf4725b
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch
@@ -0,0 +1,69 @@
+--- a/drivers/net/ar231x.c
++++ b/drivers/net/ar231x.c
+@@ -149,6 +149,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)
+@@ -283,6 +284,21 @@ int __init ar231x_probe(struct platform_
+
+ 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);
+@@ -339,8 +355,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;
+ }
+@@ -841,7 +859,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 */
+@@ -1138,6 +1161,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: