aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-04-09 14:39:01 +0000
committerJohn Crispin <john@openwrt.org>2013-04-09 14:39:01 +0000
commitfb47fd0d6b5b03eae3ad204265a398d32b422de0 (patch)
tree9fb69e26bce9726007ed3c4ffb93a79d76b429b3
parent7ca7bc501e15282d4fac3719052731113afcece1 (diff)
downloadupstream-fb47fd0d6b5b03eae3ad204265a398d32b422de0.tar.gz
upstream-fb47fd0d6b5b03eae3ad204265a398d32b422de0.tar.bz2
upstream-fb47fd0d6b5b03eae3ad204265a398d32b422de0.zip
unbreak portmapping - typo fix
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 36293
-rw-r--r--target/linux/generic/files/drivers/net/phy/swconfig.c2
-rw-r--r--target/linux/ramips/dts/FONERA20N.dts12
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index 5e95ab3d94..4e6d7136f0 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -987,7 +987,7 @@ of_switch_load_portmap(struct switch_dev *dev)
const char *segment;
int size, phys;
- if (of_device_is_compatible(port, "swconfig,port"))
+ if (!of_device_is_compatible(port, "swconfig,port"))
continue;
if (of_property_read_string(port, "swconfig,segment", &segment))
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index cb47ba5ec6..38007a7bc9 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -94,28 +94,28 @@
ralink,portmap = <0x2f>;
port@0 {
- conpatible = "swconfig,port";
+ compatible = "swconfig,port";
swconfig,segment = "lan";
swconfig,portmap = <0 4>;
};
port@1 {
- conpatible = "swconfig,port";
+ compatible = "swconfig,port";
swconfig,segment = "lan";
swconfig,portmap = <1 3>;
};
port@2 {
- conpatible = "swconfig,port";
+ compatible = "swconfig,port";
swconfig,segment = "lan";
swconfig,portmap = <2 2>;
};
port@3 {
- conpatible = "swconfig,port";
+ compatible = "swconfig,port";
swconfig,segment = "lan";
swconfig,portmap = <3 1>;
};
port@4 {
- conpatible = "swconfig,port";
- swconfig,segment = "lan";
+ compatible = "swconfig,port";
+ swconfig,segment = "wan";
swconfig,portmap = <4 0>;
};
};