summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-09 14:39:01 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-09 14:39:01 +0000
commit885bebf135517bcf7ccb61b5ee95ce318fc03903 (patch)
treeacc3a2afc47e78b74ede682330e2a28394e1bec4
parent457d3ac78059af8cf5ec55df096eab9ddd31d5d9 (diff)
[ramips] unbreak portmapping - typo fix
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36293 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 5e95ab3d9..4e6d7136f 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 cb47ba5ec..38007a7bc 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>;
};
};