aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-08-12 14:51:59 +0200
committerJohn Crispin <john@phrozen.org>2016-08-15 15:18:35 +0200
commit675407baa44a8700de20b6b2857009a552a807ba (patch)
tree22e664fb64f38dc3346217a20b2fa933d2e31df7 /target/linux/ramips
parent63f6fc5c16996cc47369bb0d6ef28ccd39845e7b (diff)
downloadupstream-675407baa44a8700de20b6b2857009a552a807ba.tar.gz
upstream-675407baa44a8700de20b6b2857009a552a807ba.tar.bz2
upstream-675407baa44a8700de20b6b2857009a552a807ba.zip
kernel/swconfig: remove obsolete portmapping feature from swconfig
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, 1 insertions, 32 deletions
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index b7eb91ea7b..004a2c0889 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -93,36 +93,6 @@
&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 5d0072fe1e..b647d889f9 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,12 +865,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
struct rt305x_esw *esw;
struct resource *irq;
int ret;
-@@ -568,6 +1353,21 @@ static int esw_probe(struct platform_dev
+@@ -568,6 +1353,20 @@ 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;