ARM: dts: ixp4xx: Fix up Actiontec MI424WR DTS files

The KS8995 switch was unconditionally wired to EthC (eth1)
on both MI424WR variants, this is wrong: the D revision has
the switch connected to EthB (eth0) so pull this assingment
out of the generic MI424WR DTSI file and make it a property
of the respective variants instead.

Signed-off-by: Linus Walleij <linusw@kernel.org>
Link: https://patch.msgid.link/20251211-ixp4xx-actiontec-dts-fix-v1-1-97af8e79d474@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts
index 413b9255f9e3cf24fd1dde6a300a8295e3fdee0f..19a8d7b077588c231683db5e47a63412f3a5033e 100644 (file)
--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts
+++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-ac.dts
@@ -12,6 +12,17 @@
        model = "Actiontec MI424WR rev A/C";
        compatible = "actiontec,mi424wr-ac", "intel,ixp42x";
 
+       /* Connect the switch to EthC */
+       spi {
+               ethernet-switch@0 {
+                       ethernet-ports {
+                               ethernet-port@4 {
+                                       ethernet = <&ethc>;
+                               };
+                       };
+               };
+       };
+
        soc {
                /* EthB used for WAN */
                ethernet@c8009000 {

diff --git a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts
index 3619c6411a5c04b78d32aac5f2fc0c42a99e7acd..244c6ea0973ff8695c62e0e46e6d4229d81760f0 100644 (file)
--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts
+++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr-d.dts
@@ -12,6 +12,17 @@
        model = "Actiontec MI424WR rev D";
        compatible = "actiontec,mi424wr-d", "intel,ixp42x";
 
+       /* Connect the switch to EthB */
+       spi {
+               ethernet-switch@0 {
+                       ethernet-ports {
+                               ethernet-port@4 {
+                                       ethernet = <&ethb>;
+                               };
+                       };
+               };
+       };
+
        soc {
                /* EthB used for LAN */
                ethernet@c8009000 {

diff --git a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi
index 76fd97c5beb69d4cd682392a7e659590cb331be4..9b54e3c01a3452da3e68aed92ab7b13d7a4804d9 100644 (file)
--- a/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi
+++ b/arch/arm/boot/dts/intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi
@@ -152,7 +152,6 @@
                                };
                                ethernet-port@4 {
                                        reg = <4>;
-                                       ethernet = <&ethc>;
                                        phy-mode = "mii";
                                        fixed-link {
                                                speed = <100>;