bcm53xx: backport more DT changes queued for v6.6

Those sort out BCM53573 Ethernet info finally.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit ca8868a51127f6081a524d47eab937b90af0bf05)

8 files changed, 290 insertions, 28 deletions

diff --git a/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
index 381a8c3894..07dd9296b6 100644
--- a/target/linux/bcm53xx/patches-5.4/130-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0009-ARM-dts-BCM53573-Fix-Ethernet-info-for-Luxul-devices.patch
@@ -1,5 +1,6 @@
+From 44ad8207806973f4e4f7d870fff36cc01f494250 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 13 Jul 2023 13:05:44 +0200
+Date: Thu, 13 Jul 2023 13:11:45 +0200
 Subject: [PATCH] ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -27,6 +28,8 @@ to work properly.
 
 Fixes: 9fb90ae6cae7 ("ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch")
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230713111145.14864-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 ---
  .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts   | 13 +++++++++++++
  .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts    | 13 +++++++++++++
diff --git a/target/linux/bcm53xx/patches-5.4/044-v6.6-0010-ARM-dts-bcm5301x-Add-SEAMA-compatibles.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0010-ARM-dts-bcm5301x-Add-SEAMA-compatibles.patch
new file mode 100644
index 0000000000..f23873e111
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0010-ARM-dts-bcm5301x-Add-SEAMA-compatibles.patch
@@ -0,0 +1,36 @@
+From 72ec77d74d28be7359ef77971cdee38b60af9e49 Mon Sep 17 00:00:00 2001
+From: Linus Walleij <linus.walleij@linaro.org>
+Date: Thu, 13 Jul 2023 00:16:42 +0200
+Subject: [PATCH] ARM: dts: bcm5301x: Add SEAMA compatibles
+
+This adds SEAMA compatibles to the firmware partition of these
+two D-Link devices.
+
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Link: https://lore.kernel.org/r/20230713-seama-partitions-v4-2-69e577453d40@linaro.org
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -33,6 +33,7 @@
+ 				#size-cells = <1>;
+ 
+ 				partition@0 {
++					compatible = "seama";
+ 					label = "firmware";
+ 					reg = <0x00000000 0x08000000>;
+ 				};
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+@@ -149,6 +149,7 @@
+ 		 * partitions: this device uses SEAMA.
+ 		 */
+ 		firmware@0 {
++			compatible = "seama";
+ 			label = "firmware";
+ 			reg = <0x00000000 0x08000000>;
+ 		};
diff --git a/target/linux/bcm53xx/patches-5.4/131-ARM-dts-BCM53573-Fix-Tenda-AC9-switch-CPU-port.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0011-ARM-dts-BCM53573-Fix-Tenda-AC9-switch-CPU-port.patch
index 7a35dcad81..d5cb817e8e 100644
--- a/target/linux/bcm53xx/patches-5.4/131-ARM-dts-BCM53573-Fix-Tenda-AC9-switch-CPU-port.patch
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0011-ARM-dts-BCM53573-Fix-Tenda-AC9-switch-CPU-port.patch
@@ -1,6 +1,7 @@
+From 7141209db9c335ab261a17933809a3e660ebdc12 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Sun, 23 Jul 2023 19:48:13 +0200
-Subject: [PATCH 1/3] ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
+Date: Sun, 23 Jul 2023 21:54:14 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Fix Tenda AC9 switch CPU port
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,6 +10,8 @@ Primary Ethernet interface is connected to the port 8 (not 5).
 
 Fixes: 64612828628c ("ARM: dts: BCM53573: Add Tenda AC9 switch ports")
 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230723195416.7831-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
 ---
  arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/linux/bcm53xx/patches-5.4/044-v6.6-0012-ARM-dts-BCM53573-Describe-BCM53125-switch-ports-in-t.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0012-ARM-dts-BCM53573-Describe-BCM53125-switch-ports-in-t.patch
new file mode 100644
index 0000000000..ab27495078
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0012-ARM-dts-BCM53573-Describe-BCM53125-switch-ports-in-t.patch
@@ -0,0 +1,97 @@
+From 8d6b61ecad2f1c939813c5c4517d53e04672dc48 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sun, 23 Jul 2023 21:54:15 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Describe BCM53125 switch ports in the
+ main DTS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BCM53125 always has 5 ports with GPHYs (for LAN/WAN ports) and 2 IMP
+ports. It seems the best place to describe that in the main .dtsi.
+Device specific bits can go to device .dts files. This will help
+avoiding some code duplication.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230723195416.7831-2-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ .../boot/dts/broadcom/bcm47189-tenda-ac9.dts  |  7 -----
+ arch/arm/boot/dts/broadcom/bcm53573.dtsi      | 26 ++++++++++++++++++-
+ 2 files changed, 25 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
++++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
+@@ -111,34 +111,27 @@
+ 
+ 	ports {
+ 		port@0 {
+-			reg = <0>;
+ 			label = "wan";
+ 		};
+ 
+ 		port@1 {
+-			reg = <1>;
+ 			label = "lan1";
+ 		};
+ 
+ 		port@2 {
+-			reg = <2>;
+ 			label = "lan2";
+ 		};
+ 
+ 		port@3 {
+-			reg = <3>;
+ 			label = "lan3";
+ 		};
+ 
+ 		port@4 {
+-			reg = <4>;
+ 			label = "lan4";
+ 		};
+ 
+ 		port@8 {
+-			reg = <8>;
+ 			label = "cpu";
+-			ethernet = <&gmac0>;
+ 		};
+ 	};
+ };
+--- a/arch/arm/boot/dts/bcm53573.dtsi
++++ b/arch/arm/boot/dts/bcm53573.dtsi
+@@ -192,10 +192,34 @@
+ 
+ 					status = "disabled";
+ 
+-					/* ports are defined in board DTS */
+ 					ports {
+ 						#address-cells = <1>;
+ 						#size-cells = <0>;
++
++						port@0 {
++							reg = <0>;
++						};
++
++						port@1 {
++							reg = <1>;
++						};
++
++						port@2 {
++							reg = <2>;
++						};
++
++						port@3 {
++							reg = <3>;
++						};
++
++						port@4 {
++							reg = <4>;
++						};
++
++						port@8 {
++							reg = <8>;
++							ethernet = <&gmac0>;
++						};
+ 					};
+ 				};
+ 			};
diff --git a/target/linux/bcm53xx/patches-5.4/044-v6.6-0013-ARM-dts-BCM53573-Add-BCM53125-switch-port-5.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0013-ARM-dts-BCM53573-Add-BCM53125-switch-port-5.patch
new file mode 100644
index 0000000000..cc9e86ac75
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0013-ARM-dts-BCM53573-Add-BCM53125-switch-port-5.patch
@@ -0,0 +1,36 @@
+From d95b1caeea194962220db1778ce7fe71cdba788b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sun, 23 Jul 2023 21:54:16 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Add BCM53125 switch port 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It's connected to the extra Ethernet interface.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230723195416.7831-3-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ arch/arm/boot/dts/broadcom/bcm53573.dtsi | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm53573.dtsi
++++ b/arch/arm/boot/dts/bcm53573.dtsi
+@@ -216,6 +216,16 @@
+ 							reg = <4>;
+ 						};
+ 
++						port@5 {
++							reg = <5>;
++							ethernet = <&gmac1>;
++
++							fixed-link {
++								speed = <1000>;
++								full-duplex;
++							};
++						};
++
+ 						port@8 {
+ 							reg = <8>;
+ 							ethernet = <&gmac0>;
diff --git a/target/linux/bcm53xx/patches-5.4/044-v6.6-0014-ARM-dts-BCM53573-Add-Ethernet-interfaces-links.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0014-ARM-dts-BCM53573-Add-Ethernet-interfaces-links.patch
new file mode 100644
index 0000000000..f97d4edd75
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0014-ARM-dts-BCM53573-Add-Ethernet-interfaces-links.patch
@@ -0,0 +1,73 @@
+From e0ae343a2c1b782a346d9b844ea65e1d49c428b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 24 Jul 2023 12:12:27 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Add Ethernet interfaces links
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BCM53573 has 2 Ethernet interfaces each connected to one of switch ports
+in the default design. They both use fixed links.
+
+An exception are Luxul XAP devices that have switch replaced by a single
+PHY.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230724101227.5420-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts    |  2 ++
+ .../arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts |  2 ++
+ arch/arm/boot/dts/broadcom/bcm53573.dtsi             | 12 ++++++++++++
+ 3 files changed, 16 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+@@ -50,6 +50,8 @@
+ 	phy-mode = "rgmii";
+ 	phy-handle = <&bcm54210e>;
+ 
++	/delete-node/ fixed-link;
++
+ 	mdio {
+ 		/delete-node/ switch@1e;
+ 
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+@@ -86,6 +86,8 @@
+ 	phy-mode = "rgmii";
+ 	phy-handle = <&bcm54210e>;
+ 
++	/delete-node/ fixed-link;
++
+ 	mdio {
+ 		/delete-node/ switch@1e;
+ 
+--- a/arch/arm/boot/dts/bcm53573.dtsi
++++ b/arch/arm/boot/dts/bcm53573.dtsi
+@@ -181,6 +181,12 @@
+ 
+ 		gmac0: ethernet@5000 {
+ 			reg = <0x5000 0x1000>;
++			phy-mode = "internal";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
+ 
+ 			mdio {
+ 				#address-cells = <1>;
+@@ -237,6 +243,12 @@
+ 
+ 		gmac1: ethernet@b000 {
+ 			reg = <0xb000 0x1000>;
++			phy-mode = "internal";
++
++			fixed-link {
++				speed = <1000>;
++				full-duplex;
++			};
+ 		};
+ 
+ 		pmu@12000 {
diff --git a/target/linux/bcm53xx/patches-5.4/044-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch b/target/linux/bcm53xx/patches-5.4/044-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch
new file mode 100644
index 0000000000..166f602452
--- /dev/null
+++ b/target/linux/bcm53xx/patches-5.4/044-v6.6-0015-ARM-dts-BCM53573-Disable-second-Ethernet-on-Luxul-de.patch
@@ -0,0 +1,39 @@
+From d8835601e3c306fda78f8736f1aef688e99e892d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 24 Jul 2023 12:11:59 +0200
+Subject: [PATCH] ARM: dts: BCM53573: Disable second Ethernet on Luxul devices
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+XAP-810 and XAP-1440 both have a single Ethernet port and BCM54210E PHY.
+Their second Ethernet interface is not connected to anything.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20230724101159.5289-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
+---
+ arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-1440.dts | 4 ++++
+ arch/arm/boot/dts/broadcom/bcm47189-luxul-xap-810.dts  | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+@@ -60,3 +60,7 @@
+ 		};
+ 	};
+ };
++
++&gmac1 {
++	status = "disabled";
++};
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+@@ -96,3 +96,7 @@
+ 		};
+ 	};
+ };
++
++&gmac1 {
++	status = "disabled";
++};
diff --git a/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch b/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch
deleted file mode 100644
index f2861177dd..0000000000
--- a/target/linux/bcm53xx/patches-5.4/321-ARM-dts-BCM5301X-Describe-partition-formats.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7166207bd1d8c46d09d640d46afc685df9bb9083 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 22 Nov 2018 09:21:49 +0100
-Subject: [PATCH] ARM: dts: BCM5301X: Describe partition formats
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's needed by OpenWrt for custom partitioning.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
-@@ -35,6 +35,7 @@
- 				partition@0 {
- 					label = "firmware";
- 					reg = <0x00000000 0x08000000>;
-+					compatible = "seama";
- 				};
- 			};
- 		};