From fb2d204ce49622a3707f1bf9402053bf632f6f58 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Sat, 2 Jan 2016 11:44:08 +0000
Subject: [PATCH] ralink: more esw_rt3050 fixes

the IRQ was not setup properly causing an oops

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 48064
---
 .../0514-net-mediatek-fix_esw.patch           | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 target/linux/ramips/patches-4.3/0514-net-mediatek-fix_esw.patch

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 00000000000..0ea45924838
--- /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)
-- 
2.30.2