aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-4.1/950-cpmac_titan.patch
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-10-29 23:28:39 +0100
committerJonas Gorski <jonas.gorski@gmail.com>2017-10-29 23:41:00 +0100
commit1d30869cd2f589b27227428863ebd201099106ce (patch)
tree187edc7af6c080d45cd7d94c06eda2993b5bc0fb /target/linux/ar7/patches-4.1/950-cpmac_titan.patch
parentbe11b3b1c71945fbac359104a21d55f245800c7b (diff)
downloadupstream-1d30869cd2f589b27227428863ebd201099106ce.tar.gz
upstream-1d30869cd2f589b27227428863ebd201099106ce.tar.bz2
upstream-1d30869cd2f589b27227428863ebd201099106ce.zip
ar7: drop unused 4.1 support
Kernel 4.1 isn't support anymore anyway. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Diffstat (limited to 'target/linux/ar7/patches-4.1/950-cpmac_titan.patch')
-rw-r--r--target/linux/ar7/patches-4.1/950-cpmac_titan.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/ar7/patches-4.1/950-cpmac_titan.patch b/target/linux/ar7/patches-4.1/950-cpmac_titan.patch
deleted file mode 100644
index f1d432cc4c..0000000000
--- a/target/linux/ar7/patches-4.1/950-cpmac_titan.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/drivers/net/ethernet/ti/cpmac.c
-+++ b/drivers/net/ethernet/ti/cpmac.c
-@@ -1146,6 +1146,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;
-@@ -1227,7 +1229,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");
-@@ -1238,10 +1240,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++) {
-@@ -1258,7 +1266,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);