From 45e47a9cd7b8ad5572eedb7ed5befec553a3f04d Mon Sep 17 00:00:00 2001
From: Pawel Dembicki <paweldembicki@gmail.com>
Date: Mon, 2 Mar 2020 21:42:34 +0100
Subject: kirkwood: initial refresh of 5.4 patches

Refreshed all patches.
Changed:
105-ea4500.patch-> Upstream DSA driver was updated. Patch was fixed
202-linksys-find-active-root.patch -> Upstream driver was moved. Patch
was fixed

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
---
 target/linux/kirkwood/patches-5.4/105-ea4500.patch | 77 ++++------------------
 1 file changed, 14 insertions(+), 63 deletions(-)

(limited to 'target/linux/kirkwood/patches-5.4/105-ea4500.patch')

diff --git a/target/linux/kirkwood/patches-5.4/105-ea4500.patch b/target/linux/kirkwood/patches-5.4/105-ea4500.patch
index 4c3c82bdfd..7302723029 100644
--- a/target/linux/kirkwood/patches-5.4/105-ea4500.patch
+++ b/target/linux/kirkwood/patches-5.4/105-ea4500.patch
@@ -23,13 +23,12 @@
  		};
  
  		white-pulse {
-@@ -67,9 +72,18 @@
+@@ -66,6 +71,17 @@
+ 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
  		};
  	};
- 
--	dsa {
--		status = "disabled";
-+	mvsw61xx {
++
++	mvsw61xx@10 {
 +		compatible = "marvell,88e6171";
 +		status = "okay";
 +		reg = <0x10>;
@@ -39,12 +38,10 @@
 +		cpu-port-1 = <6>;
 +		is-indirect;
 +	};
+ };
  
-+	dsa {
- 		compatible = "marvell,dsa";
- 		#address-cells = <2>;
- 		#size-cells = <0>;
-@@ -161,22 +175,22 @@
+ &pinctrl {
+@@ -114,22 +130,22 @@
  		};
  
  		partition@200000 {
@@ -71,61 +68,15 @@
  			reg = <0x1EA0000 0x1760000>;
  		};
  
-@@ -207,53 +221,6 @@
- 
- &mdio {
+@@ -162,6 +178,7 @@
  	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;
--				};
--			};
--		};
--	};
- };
  
- &uart0 {
-@@ -272,10 +239,14 @@
+ 	switch@10 {
++		status = "disabled";
+ 		compatible = "marvell,mv88e6085";
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+@@ -225,10 +242,14 @@
  };
  
  /* eth1 is connected to the switch at port 6. However DSA only supports a
-- 
cgit v1.2.3