diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-12-18 11:57:42 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-18 11:57:42 +0000 |
commit | 4ccf215a3ee81fc95007d7f71068c834af6caa89 (patch) | |
tree | 157c01a5976795a45337af91db57c6b488a917eb /target/linux/ar7/patches-3.10/950-cpmac_titan.patch | |
parent | 0e035381dc3103ce9f8e9696eb28a9aa890d0c55 (diff) | |
download | upstream-4ccf215a3ee81fc95007d7f71068c834af6caa89.tar.gz upstream-4ccf215a3ee81fc95007d7f71068c834af6caa89.tar.bz2 upstream-4ccf215a3ee81fc95007d7f71068c834af6caa89.zip |
ar7: remove leftover 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 43746
Diffstat (limited to 'target/linux/ar7/patches-3.10/950-cpmac_titan.patch')
-rw-r--r-- | target/linux/ar7/patches-3.10/950-cpmac_titan.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ar7/patches-3.10/950-cpmac_titan.patch b/target/linux/ar7/patches-3.10/950-cpmac_titan.patch deleted file mode 100644 index bc31222cb8..0000000000 --- a/target/linux/ar7/patches-3.10/950-cpmac_titan.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/drivers/net/ethernet/ti/cpmac.c -+++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1155,6 +1155,8 @@ static int cpmac_probe(struct platform_d - goto fail; - } - -+ ar7_device_reset(pdata->reset_bit); -+ - dev->irq = platform_get_irq_byname(pdev, "irq"); - - dev->netdev_ops = &cpmac_netdev_ops; -@@ -1233,7 +1235,7 @@ int 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"); -@@ -1244,10 +1246,16 @@ int 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++) { -@@ -1264,7 +1272,11 @@ int cpmac_init(void) - mask = 0; - } - -- cpmac_mii->phy_mask = ~(mask | 0x80000000); -+ if (ar7_is_titan()) -+ cpmac_mii->phy_mask = ~(mask | 0x80000000 | 0x40000000); -+ else -+ cpmac_mii->phy_mask = ~(mask | 0x80000000); -+ - snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "cpmac-1"); - - res = mdiobus_register(cpmac_mii); |