From 5f92bde6db33a0ad40231b19fc1d4ded9ea2eca2 Mon Sep 17 00:00:00 2001
From: Pawel Dembicki <paweldembicki@gmail.com>
Date: Wed, 28 Oct 2020 22:32:05 +0100
Subject: [PATCH] kirkwood: remove DSA nodes from Linksyses dts

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
---
 .../kirkwood/patches-4.14/104-ea3500.patch    | 47 +--------------
 .../kirkwood/patches-4.14/105-ea4500.patch    | 58 ++++++++++++++++---
 2 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/target/linux/kirkwood/patches-4.14/104-ea3500.patch b/target/linux/kirkwood/patches-4.14/104-ea3500.patch
index 73bb252a79..2b8118a995 100644
--- a/target/linux/kirkwood/patches-4.14/104-ea3500.patch
+++ b/target/linux/kirkwood/patches-4.14/104-ea3500.patch
@@ -10,7 +10,7 @@
      kirkwood-lsxhl.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
-@@ -0,0 +1,245 @@
+@@ -0,0 +1,200 @@
 +/*
 + * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
 + *
@@ -87,51 +87,6 @@
 +        cpu-port-1 = <6>;
 +        is-indirect;
 +    };
-+
-+    dsa {
-+        compatible = "marvell,dsa";
-+        #address-cells = <2>;
-+        #size-cells = <0>;
-+
-+        dsa,ethernet = <&eth0port>;
-+        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";
-+            };
-+        };
-+    };
 +};
 +
 +&pinctrl {
diff --git a/target/linux/kirkwood/patches-4.14/105-ea4500.patch b/target/linux/kirkwood/patches-4.14/105-ea4500.patch
index 6cc3de221b..253405a190 100644
--- a/target/linux/kirkwood/patches-4.14/105-ea4500.patch
+++ b/target/linux/kirkwood/patches-4.14/105-ea4500.patch
@@ -1,11 +1,54 @@
 --- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
 +++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
-@@ -69,9 +69,18 @@
+@@ -69,51 +69,15 @@
          };
      };
  
 -    dsa {
 -        status = "disabled";
+-
+-        compatible = "marvell,dsa";
+-        #address-cells = <2>;
+-        #size-cells = <0>;
+-
+-        dsa,ethernet = <&eth0port>;
+-        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";
@@ -15,13 +58,10 @@
 +        cpu-port-0 = <5>;
 +        cpu-port-1 = <6>;
 +        is-indirect;
-+    };
+     };
+ };
  
-+    dsa {
-         compatible = "marvell,dsa";
-         #address-cells = <2>;
-         #size-cells = <0>;
-@@ -163,22 +172,22 @@
+@@ -163,22 +127,22 @@
          };
  
          partition@200000 {
@@ -48,7 +88,7 @@
              reg = <0x1EA0000 0x1760000>;
          };
  
-@@ -209,53 +218,6 @@
+@@ -209,53 +173,6 @@
  
  &mdio {
      status = "okay";
@@ -102,7 +142,7 @@
  };
  
  &uart0 {
-@@ -274,10 +236,14 @@
+@@ -274,10 +191,14 @@
  };
  
  /* eth1 is connected to the switch at port 6. However DSA only supports a
-- 
2.25.1