aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-07-17 16:36:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-07-17 16:36:16 +0000
commit6be418e3e1a6e45af6b7575f2e41023c6f981ba7 (patch)
tree07de0edfb3d113b3d37af150480c8da7a4fab073 /target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
parent4f05d696ad1ca1a85080ece6092d41410ced31ed (diff)
downloadupstream-6be418e3e1a6e45af6b7575f2e41023c6f981ba7.tar.gz
upstream-6be418e3e1a6e45af6b7575f2e41023c6f981ba7.tar.bz2
upstream-6be418e3e1a6e45af6b7575f2e41023c6f981ba7.zip
atheros[ar231x-eth]: update MAC and PHY reset method
Pass reset_set and reset_clear callback functions pointers via platform_data instead of reset register address. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 41689
Diffstat (limited to 'target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch')
-rw-r--r--target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
index 2cc31e1cd2..ada0a76b13 100644
--- a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
@@ -41,7 +41,7 @@
int ar231x_probe(struct platform_device *pdev)
{
struct net_device *dev;
-@@ -293,6 +320,23 @@ int ar231x_probe(struct platform_device
+@@ -287,6 +314,23 @@ int ar231x_probe(struct platform_device
mdiobus_register(sp->mii_bus);
@@ -65,7 +65,7 @@
if (ar231x_mdiobus_probe(dev) != 0) {
printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
rx_tasklet_cleanup(dev);
-@@ -349,8 +393,10 @@ static int ar231x_remove(struct platform
+@@ -343,8 +387,10 @@ static int ar231x_remove(struct platform
rx_tasklet_cleanup(dev);
ar231x_init_cleanup(dev);
unregister_netdev(dev);
@@ -78,7 +78,7 @@
kfree(dev);
return 0;
}
-@@ -1108,6 +1154,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1103,6 +1149,9 @@ static int ar231x_ioctl(struct net_devic
struct ar231x_private *sp = netdev_priv(dev);
int ret;