aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-08 09:54:51 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-08 09:54:51 +0200
commite3ab280e47000aee3dc0ea916bcb656490e9839d (patch)
tree4e61f399b6624044b76e9437660eea975345080f /target/linux/ar7/patches-3.18/950-cpmac_titan.patch
parent5742a2ba35e20b7fe7ca9aac3ceb42e0a4f37ca0 (diff)
downloadupstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.gz
upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.bz2
upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.zip
kernel: remove linux 3.18 support
No targets are using it anymore Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar7/patches-3.18/950-cpmac_titan.patch')
-rw-r--r--target/linux/ar7/patches-3.18/950-cpmac_titan.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ar7/patches-3.18/950-cpmac_titan.patch b/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
deleted file mode 100644
index 3cabae067a..0000000000
--- a/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/drivers/net/ethernet/ti/cpmac.c
-+++ b/drivers/net/ethernet/ti/cpmac.c
-@@ -1147,6 +1147,8 @@ static int cpmac_probe(struct platform_d
- goto out;
- }
-
-+ ar7_device_reset(pdata->reset_bit);
-+
- dev->irq = platform_get_irq_byname(pdev, "irq");
-
- dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1228,7 +1230,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) {
- pr_err("Can't ioremap mdio registers\n");
-@@ -1239,10 +1241,16 @@ int cpmac_init(void)
- /* 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++) {
-@@ -1259,7 +1267,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);