diff options
| author | John Crispin <john@openwrt.org> | 2015-03-16 07:41:10 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-03-16 07:41:10 +0000 |
| commit | 46f01fec7f851474ffd2604749b80403ec93d4b6 (patch) | |
| tree | a3f1454304c0e810989724ac0cd25b5a2f60165e /target/linux/ar7/patches-3.14/950-cpmac_titan.patch | |
| parent | 4d11bb0d23158ca3141fdbb014635f3b0333d83a (diff) | |
| download | upstream-46f01fec7f851474ffd2604749b80403ec93d4b6.tar.gz upstream-46f01fec7f851474ffd2604749b80403ec93d4b6.tar.bz2 upstream-46f01fec7f851474ffd2604749b80403ec93d4b6.zip | |
ar7: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 44822
Diffstat (limited to 'target/linux/ar7/patches-3.14/950-cpmac_titan.patch')
| -rw-r--r-- | target/linux/ar7/patches-3.14/950-cpmac_titan.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch deleted file mode 100644 index 1d76e9fd78..0000000000 --- a/target/linux/ar7/patches-3.14/950-cpmac_titan.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/drivers/net/ethernet/ti/cpmac.c -+++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1154,6 +1154,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; -@@ -1232,7 +1234,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"); -@@ -1243,10 +1245,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++) { -@@ -1263,7 +1271,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); |