aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.14/950-cpmac_titan.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-08 06:15:03 +0000
committerJohn Crispin <john@openwrt.org>2014-12-08 06:15:03 +0000
commit7c7964e10d7b74b31a0de734715371a96ce401f6 (patch)
treea5f23e635068597ce8dc81b044e6954ef0278ff4 /target/linux/ar7/patches-3.14/950-cpmac_titan.patch
parentaba92ec05ec71241da62a6c68e96f72067dd3732 (diff)
downloadupstream-7c7964e10d7b74b31a0de734715371a96ce401f6.tar.gz
upstream-7c7964e10d7b74b31a0de734715371a96ce401f6.tar.bz2
upstream-7c7964e10d7b74b31a0de734715371a96ce401f6.zip
ar7: bump to 3.14
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 43553
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.patch52
1 files changed, 52 insertions, 0 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
new file mode 100644
index 0000000000..bc31222cb8
--- /dev/null
+++ b/target/linux/ar7/patches-3.14/950-cpmac_titan.patch
@@ -0,0 +1,52 @@
+--- 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);