aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-08-16 10:19:13 +0200
committerJohn Crispin <john@phrozen.org>2016-08-16 10:20:01 +0200
commit99a188828713d6ff9c541590b08d4e63ef52f6d7 (patch)
treeefe6ec0d17b98554bc810ed0e68e0a1f98f2d6a8 /target/linux/ramips
parent58466208909d5b9264537256b353b3c3db57ef0e (diff)
downloadupstream-99a188828713d6ff9c541590b08d4e63ef52f6d7.tar.gz
upstream-99a188828713d6ff9c541590b08d4e63ef52f6d7.tar.bz2
upstream-99a188828713d6ff9c541590b08d4e63ef52f6d7.zip
swconfig: revert the portmapping patches, they seem to cause a segfault
Revert "kernel/swconfig: remove obsolete portmapping feature from swconfig" This reverts commit 675407baa44a8700de20b6b2857009a552a807ba. Revert "swconfig: remove obsolete portmapping feature" This reverts commit fca1eb349ef31b133a62880cbd562d6bf17500aa. Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/dts/FONERA20N.dts30
-rw-r--r--target/linux/ramips/patches-4.4/0512-net-mediatek-add-swconfig-driver-for-esw_rt3050.patch3
2 files changed, 32 insertions, 1 deletions
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index 004a2c0889..b7eb91ea7b 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -93,6 +93,36 @@
&esw {
mediatek,portmap = <0x2f>;
+
+ port@0 {
+ compatible = "swconfig,port";
+ swconfig,segment = "lan";
+ swconfig,portmap = <0 4>;
+ };
+
+ port@1 {
+ compatible = "swconfig,port";
+ swconfig,segment = "lan";
+ swconfig,portmap = <1 3>;
+ };
+
+ port@2 {
+ compatible = "swconfig,port";
+ swconfig,segment = "lan";
+ swconfig,portmap = <2 2>;
+ };
+
+ port@3 {
+ compatible = "swconfig,port";
+ swconfig,segment = "lan";
+ swconfig,portmap = <3 1>;
+ };
+
+ port@4 {
+ compatible = "swconfig,port";
+ swconfig,segment = "wan";
+ swconfig,portmap = <4 0>;
+ };
};
&wmac {
diff --git a/target/linux/ramips/patches-4.4/0512-net-mediatek-add-swconfig-driver-for-esw_rt3050.patch b/target/linux/ramips/patches-4.4/0512-net-mediatek-add-swconfig-driver-for-esw_rt3050.patch
index b647d889f9..5d0072fe1e 100644
--- a/target/linux/ramips/patches-4.4/0512-net-mediatek-add-swconfig-driver-for-esw_rt3050.patch
+++ b/target/linux/ramips/patches-4.4/0512-net-mediatek-add-swconfig-driver-for-esw_rt3050.patch
@@ -865,11 +865,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
struct rt305x_esw *esw;
struct resource *irq;
int ret;
-@@ -568,6 +1353,20 @@ static int esw_probe(struct platform_dev
+@@ -568,6 +1353,21 @@ static int esw_probe(struct platform_dev
if (reg_init)
esw->reg_led_polarity = be32_to_cpu(*reg_init);
+ swdev = &esw->swdev;
++ swdev->of_node = pdev->dev.of_node;
+ swdev->name = "rt305x-esw";
+ swdev->alias = "rt305x";
+ swdev->cpu_port = RT305X_ESW_PORT6;