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:46 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-07-17 16:36:46 +0000
commit6c0e82e860750bfbd0bc3097bf3872a1b01e5703 (patch)
tree806eea176f4ad2113ebea4198af9e07b2178c7df /target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
parentca397ef82058dee125e634e23342a828edc6dc5f (diff)
downloadupstream-6c0e82e860750bfbd0bc3097bf3872a1b01e5703.tar.gz
upstream-6c0e82e860750bfbd0bc3097bf3872a1b01e5703.tar.bz2
upstream-6c0e82e860750bfbd0bc3097bf3872a1b01e5703.zip
atheros[ar231x-eth]: pass PHY I/O memory via device resources
Pass PHY I/O memory region via platform resources and remap them unconditionally. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41698 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch8
1 files changed, 4 insertions, 4 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 361b4e3466..dade7ee6ab 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
@@ -38,10 +38,10 @@
+ return 0;
+}
+
- int ar231x_probe(struct platform_device *pdev)
+ static int ar231x_probe(struct platform_device *pdev)
{
struct net_device *dev;
-@@ -284,6 +311,23 @@ int ar231x_probe(struct platform_device
+@@ -286,6 +313,23 @@ static int ar231x_probe(struct platform_
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);
-@@ -340,8 +384,10 @@ static int ar231x_remove(struct platform
+@@ -342,8 +386,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;
}
-@@ -1100,6 +1146,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1104,6 +1150,9 @@ static int ar231x_ioctl(struct net_devic
struct ar231x_private *sp = netdev_priv(dev);
int ret;