diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-05 17:32:43 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-05 17:32:43 +0000 |
commit | 28e897845fbf46934553312bb03dd7401034f246 (patch) | |
tree | 13773470f64ea667d3f01588839ad53ab2a2b54d /target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch | |
parent | 047a51c4fdf69fa06ce4a9e6755c456d373b87f7 (diff) | |
download | upstream-28e897845fbf46934553312bb03dd7401034f246.tar.gz upstream-28e897845fbf46934553312bb03dd7401034f246.tar.bz2 upstream-28e897845fbf46934553312bb03dd7401034f246.zip |
ar7: remove 2.6.37 support
SVN-Revision: 31617
Diffstat (limited to 'target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch')
-rw-r--r-- | target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch b/target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch deleted file mode 100644 index 65a5b70b7e..0000000000 --- a/target/linux/ar7/patches-2.6.37/950-cpmac_titan.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/drivers/net/cpmac.c -+++ b/drivers/net/cpmac.c -@@ -1155,6 +1155,8 @@ static int __devinit cpmac_probe(struct - goto fail; - } - -+ ar7_device_reset(pdata->reset_bit); -+ - dev->irq = platform_get_irq_byname(pdev, "irq"); - - dev->netdev_ops = &cpmac_netdev_ops; -@@ -1231,7 +1233,7 @@ int __devinit cpmac_init(void) - cpmac_mii->reset = cpmac_mdio_reset; - cpmac_mii->irq = mii_irqs; - -- cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256); -+ cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256); - - if (!cpmac_mii->priv) { - printk(KERN_ERR "Can't ioremap mdio registers\n"); -@@ -1242,10 +1244,16 @@ int __devinit cpmac_init(void) - #warning FIXME: unhardcode gpio&reset bits - ar7_gpio_disable(26); - ar7_gpio_disable(27); -- ar7_device_reset(AR7_RESET_BIT_CPMAC_LO); -- ar7_device_reset(AR7_RESET_BIT_CPMAC_HI); -+ -+ if (!ar7_is_titan()) { -+ ar7_device_reset(AR7_RESET_BIT_CPMAC_LO); -+ ar7_device_reset(AR7_RESET_BIT_CPMAC_HI); -+ } - ar7_device_reset(AR7_RESET_BIT_EPHY); - -+ if (ar7_is_titan()) -+ ar7_device_reset(TITAN_RESET_BIT_EPHY1); -+ - cpmac_mii->reset(cpmac_mii); - - for (i = 0; i < 300; i++) -@@ -1260,7 +1268,8 @@ int __devinit cpmac_init(void) - mask = 0; - } - -- cpmac_mii->phy_mask = ~(mask | 0x80000000); -+ cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000) : -+ ~(mask | 0x80000000); - snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1"); - - res = mdiobus_register(cpmac_mii); |