From: Pawel Dembicki <paweldembi...@gmail.com>
Changes made in switch nodes in d42c9ce commit cause problems with
correct mvsw61xx detection. This commit undoes those changes.
Fixes: d42c9ce326aa ("kirkwood: add kernel 4.19 support")
Tested-by: Marcin Fedan <mfe...@gmail.com> [EA4500]
Signed-off-by: Pawel Dembicki <paweldembi...@gmail.com>
[rebased, minor commit message/title adjustments]
Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
---
.../arm/boot/dts/kirkwood-linksys-audi.dts | 23 ++++++--------
.../kirkwood/patches-4.19/105-ea4500.patch | 31 ++++++++-----------
2 files changed, 22 insertions(+), 32 deletions(-)
diff --git
a/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts
b/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts
index 0d00943dfd..05e24aa93f 100644
---
a/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts
+++
b/target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts
@@ -67,20 +67,15 @@
};
};
- switches {
- #address-cells = <1>;
- #size-cells = <0>;
-
- mvsw61xx@10 {
- compatible = "marvell,88e6171";
- status = "okay";
- reg = <0x10>;
-
- mii-bus = <&mdio>;
- cpu-port-0 = <5>;
- cpu-port-1 = <6>;
- is-indirect;
- };
+ mvsw61xx {
+ compatible = "marvell,88e6171";
+ status = "okay";
+ reg = <0x10>;
+
+ mii-bus = <&mdio>;
+ cpu-port-0 = <5>;
+ cpu-port-1 = <6>;
+ is-indirect;
};
dsa {
diff --git a/target/linux/kirkwood/patches-4.19/105-ea4500.patch
b/target/linux/kirkwood/patches-4.19/105-ea4500.patch
index 5948a1bdf1..3e6f936c5a 100644
--- a/target/linux/kirkwood/patches-4.19/105-ea4500.patch
+++ b/target/linux/kirkwood/patches-4.19/105-ea4500.patch
@@ -23,33 +23,28 @@
};
white-pulse {
-@@ -67,9 +72,23 @@
+@@ -67,9 +72,18 @@
};
};
- dsa {
- status = "disabled";
-+ switches {
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-
-+ mvsw61xx@10 {
-+ compatible = "marvell,88e6171";
-+ status = "okay";
-+ reg = <0x10>;
++ mvsw61xx@10 {
++ compatible = "marvell,88e6171";
++ status = "okay";
++ reg = <0x10>;
+
-+ mii-bus = <&mdio>;
-+ cpu-port-0 = <5>;
-+ cpu-port-1 = <6>;
-+ is-indirect;
-+ };
++ mii-bus = <&mdio>;
++ cpu-port-0 = <5>;
++ cpu-port-1 = <6>;
++ is-indirect;
+ };
-+
+
+ dsa {
compatible = "marvell,dsa";
#address-cells = <2>;
#size-cells = <0>;
-@@ -161,22 +180,22 @@
+@@ -161,22 +175,22 @@
};
partition@200000 {
@@ -76,7 +71,7 @@
reg = <0x1EA0000 0x1760000>;
};
-@@ -207,53 +226,6 @@
+@@ -207,53 +221,6 @@
&mdio {
status = "okay";
@@ -130,7 +125,7 @@
};
&uart0 {
-@@ -272,10 +244,14 @@
+@@ -272,10 +239,14 @@
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
--
2.20.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
