diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-21 17:45:54 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-02-21 17:45:54 +0000 |
commit | 14d8e68c1c33b29b1ee996b183684b4e3b471d2b (patch) | |
tree | e5c4694fa2611c8c0cb5ab6ed00c05b19d9833b9 /target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch | |
parent | 2799c19eaa3d1acd4771e4f98165162b794cc9e8 (diff) |
atheros: add support for linux kernel v3.8
This builds and boots.
Because of the function pointer indirection (e.g. mtd_info's read
function pointer is assigned to spiflash_read), it is difficult for me
to understand where the calls are coming from (could be anywhere,
conditionally pointing at spiflash versions), so I punted and used the
renamed function pointers (_erase, _read, _write). If someone knows
better what to do, please fix.
Cleaned up other sundry kernel tracking issues like get_phy_id and
__devinit,etc.
[juhosg: don't switch to that yet]
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch')
-rw-r--r-- | target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch new file mode 100644 index 000000000..da8685721 --- /dev/null +++ b/target/linux/atheros/patches-3.8/220-enet_micrel_workaround.patch @@ -0,0 +1,86 @@ +--- a/drivers/net/ethernet/ar231x/ar231x.c ++++ b/drivers/net/ethernet/ar231x/ar231x.c +@@ -150,6 +150,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) +@@ -182,6 +183,30 @@ static const struct net_device_ops ar231 + #endif + }; + ++static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id) ++{ ++ int phy_reg; ++ ++ /* Grab the bits from PHYIR1, and put them ++ * in the upper half */ ++ phy_reg = mdiobus_read(bus, addr, MII_PHYSID1); ++ ++ if (phy_reg < 0) ++ return -EIO; ++ ++ *phy_id = (phy_reg & 0xffff) << 16; ++ ++ /* Grab the bits from PHYIR2, and put them in the lower half */ ++ phy_reg = mdiobus_read(bus, addr, MII_PHYSID2); ++ ++ if (phy_reg < 0) ++ return -EIO; ++ ++ *phy_id |= (phy_reg & 0xffff); ++ ++ return 0; ++} ++ + int ar231x_probe(struct platform_device *pdev) + { + struct net_device *dev; +@@ -299,6 +324,21 @@ int ar231x_probe(struct platform_device + + 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); +@@ -355,8 +395,10 @@ static int ar231x_remove(struct platform + 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; + } +@@ -1132,6 +1174,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: |