aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/kirkwood/files-5.4
diff options
context:
space:
mode:
authorPawel Dembicki <paweldembicki@gmail.com>2020-04-20 10:06:36 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-04-28 16:49:31 +0200
commit4fd7e539e4f90128bdd7cb71c729a4b32f5de86e (patch)
tree74caf584970ce1d8c1b5c6604e2c228d3a97faea /target/linux/kirkwood/files-5.4
parent4b3b8ec81cd1965d0bd548fa31db491295b83354 (diff)
downloadupstream-4fd7e539e4f90128bdd7cb71c729a4b32f5de86e.tar.gz
upstream-4fd7e539e4f90128bdd7cb71c729a4b32f5de86e.tar.bz2
upstream-4fd7e539e4f90128bdd7cb71c729a4b32f5de86e.zip
kirkwood: switch from swconfig to dsa
This patch removes support for swconfig and switches to dsa driver. swconfig and switch drivers are removed. DSA driver is enabled and configuration is adjusted. In kirkwood only two devices have switches: Linksys EA3500 and EA4500. WAN MAC configuration in 02_network is required because otherwise WAN would have the same MAC address as lan interfaces. In swconfig solution the WAN address was assigned in u-Boot to eth1. Now, as eth1 is disabled and wan is part of the switch, we have to set it manually. Compile tested: EA3500, EA4500 Run tested: EA4500 Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> [minor commit title/message adjustments, remove swconfig package for devices] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/kirkwood/files-5.4')
-rw-r--r--target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-linksys-audi.dts71
1 files changed, 53 insertions, 18 deletions
diff --git a/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-linksys-audi.dts b/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-linksys-audi.dts
index eff9102d33..90250fefc8 100644
--- a/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-linksys-audi.dts
+++ b/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-linksys-audi.dts
@@ -66,17 +66,6 @@
default-state = "on";
};
};
-
- mvsw61xx {
- compatible = "marvell,88e6171";
- status = "okay";
- reg = <0x10>;
-
- mii-bus = <&mdio>;
- cpu-port-0 = <5>;
- cpu-port-1 = <6>;
- is-indirect;
- };
};
&pinctrl {
@@ -96,6 +85,57 @@
};
};
+&mdio {
+ status = "okay";
+
+ switch@10 {
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <16>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ label = "ethernet1";
+ };
+
+ port@1 {
+ reg = <1>;
+ label = "ethernet2";
+ };
+
+ port@2 {
+ reg = <2>;
+ label = "ethernet3";
+ };
+
+ port@3 {
+ reg = <3>;
+ label = "ethernet4";
+ };
+
+ port@4 {
+ reg = <4>;
+ label = "internet";
+ };
+
+ port@5 {
+ reg = <5>;
+ label = "cpu";
+ ethernet = <&eth0port>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
+ };
+ };
+};
+
&nand {
status = "okay";
@@ -188,15 +228,10 @@
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
- * single CPU port. Upstream uses DSA so they disable this port to avoid confusion.
+ * single CPU port. This port is disabled to avoid confusion.
*/
&eth1 {
- status = "okay";
-
- ethernet1-port@0 {
- speed = <1000>;
- duplex = <1>;
- };
+ status = "disabled";
};
/* There is no battery on the board, so the RTC does not keep