aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-01-02 11:44:08 +0000
committerJohn Crispin <blogic@openwrt.org>2016-01-02 11:44:08 +0000
commit2de07da5b0421fb2b784900d0c79ec0ccf4043b4 (patch)
treedac89342421cd34d7af50472324c3880c5c57d09 /target/linux
parent56cedd7e5b718e9cd2d907d8d4661a801c27e20a (diff)
downloadmaster-187ad058-2de07da5b0421fb2b784900d0c79ec0ccf4043b4.tar.gz
master-187ad058-2de07da5b0421fb2b784900d0c79ec0ccf4043b4.tar.bz2
master-187ad058-2de07da5b0421fb2b784900d0c79ec0ccf4043b4.zip
ralink: more esw_rt3050 fixes
the IRQ was not setup properly causing an oops Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48064 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/patches-4.3/0514-net-mediatek-fix_esw.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-4.3/0514-net-mediatek-fix_esw.patch b/target/linux/ramips/patches-4.3/0514-net-mediatek-fix_esw.patch
new file mode 100644
index 0000000000..0ea4592483
--- /dev/null
+++ b/target/linux/ramips/patches-4.3/0514-net-mediatek-fix_esw.patch
@@ -0,0 +1,48 @@
+--- a/drivers/net/ethernet/mediatek/esw_rt3050.c
++++ b/drivers/net/ethernet/mediatek/esw_rt3050.c
+@@ -16,6 +16,7 @@
+ #include <linux/kernel.h>
+ #include <linux/platform_device.h>
+ #include <asm/mach-ralink/ralink_regs.h>
++#include <linux/of_irq.h>
+
+ #include <linux/switch.h>
+
+@@ -1332,7 +1333,6 @@
+ const __be32 *port_map, *reg_init;
+ struct switch_dev *swdev;
+ struct rt305x_esw *esw;
+- struct resource *irq;
+ int ret;
+
+ esw = devm_kzalloc(&pdev->dev, sizeof(*esw), GFP_KERNEL);
+@@ -1340,7 +1340,7 @@
+ return -ENOMEM;
+
+ esw->dev = &pdev->dev;
+- esw->irq = irq->start;
++ esw->irq = irq_of_parse_and_map(np, 0);
+ esw->base = devm_ioremap_resource(&pdev->dev, res);
+ if (!esw->base)
+ return -EADDRNOTAVAIL;
+@@ -1365,7 +1365,7 @@
+ ret = register_switch(swdev, NULL);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "register_switch failed\n");
+- goto unmap_base;
++ return ret;
+ }
+
+ platform_set_drvdata(pdev, esw);
+@@ -1383,11 +1383,6 @@
+ }
+
+ return ret;
+-
+-unmap_base:
+- iounmap(esw->base);
+- kfree(esw);
+- return ret;
+ }
+
+ static int esw_remove(struct platform_device *pdev)