aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
diff options
context:
space:
mode:
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.patch12
1 files changed, 6 insertions, 6 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
index 1d76e9fd78..f1d432cc4c 100644
--- a/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
+++ b/target/linux/ar7/patches-3.18/950-cpmac_titan.patch
@@ -1,7 +1,7 @@
--- 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;
+@@ -1146,6 +1146,8 @@ static int cpmac_probe(struct platform_d
+ goto out;
}
+ ar7_device_reset(pdata->reset_bit);
@@ -9,7 +9,7 @@
dev->irq = platform_get_irq_byname(pdev, "irq");
dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1232,7 +1234,7 @@ int cpmac_init(void)
+@@ -1227,7 +1229,7 @@ int cpmac_init(void)
cpmac_mii->reset = cpmac_mdio_reset;
cpmac_mii->irq = mii_irqs;
@@ -17,8 +17,8 @@
+ 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)
+ 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);
@@ -37,7 +37,7 @@
cpmac_mii->reset(cpmac_mii);
for (i = 0; i < 300; i++) {
-@@ -1263,7 +1271,11 @@ int cpmac_init(void)
+@@ -1258,7 +1266,11 @@ int cpmac_init(void)
mask = 0;
}