diff options
| author | Pawel Dembicki <paweldembicki@gmail.com> | 2020-02-10 05:13:26 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-03-03 23:38:23 +0100 |
| commit | 61b40187633dad298c3d073894037de02e2d7204 (patch) | |
| tree | 3680e3818b6fbbb18885ab1bc91659e946be4ed3 | |
| parent | 45e47a9cd7b8ad5572eedb7ed5befec553a3f04d (diff) | |
| download | upstream-61b40187633dad298c3d073894037de02e2d7204.tar.gz upstream-61b40187633dad298c3d073894037de02e2d7204.tar.bz2 upstream-61b40187633dad298c3d073894037de02e2d7204.zip | |
kirkwood: fix switch dts node in EA4500 and EA3500
Changes made in switch nodes in d42c9ce commit causes problem with
correct mvsw61xx detection. This commit undo that changes.
mvsw61xx is platform driver, so it need to be in main root of dts.
Fixes: d42c9ce326aa ("kirkwood: add kernel 4.19 support")
Tested-by: Marcin Fedan <mfedan@gmail.com> [EA4500]
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
| -rw-r--r-- | target/linux/kirkwood/files-4.19/arch/arm/boot/dts/kirkwood-linksys-audi.dts | 68 | ||||
| -rw-r--r-- | target/linux/kirkwood/patches-4.19/105-ea4500.patch | 31 |
2 files changed, 22 insertions, 77 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 0d00943dfd5..eff9102d33c 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,65 +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; - }; - }; - - dsa { - compatible = "marvell,dsa"; - #address-cells = <2>; - #size-cells = <0>; - - dsa,ethernet = <ð0port>; - dsa,mii-bus = <&mdio>; - - switch@16,0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <16 0>; /* MDIO address 16, switch 0 in tree */ - - 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"; - }; - }; + mvsw61xx { + compatible = "marvell,88e6171"; + status = "okay"; + reg = <0x10>; + + mii-bus = <&mdio>; + cpu-port-0 = <5>; + cpu-port-1 = <6>; + is-indirect; }; }; diff --git a/target/linux/kirkwood/patches-4.19/105-ea4500.patch b/target/linux/kirkwood/patches-4.19/105-ea4500.patch index 5948a1bdf1e..4c3c82bdfd9 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 { ++ 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 |