microchipsw: use upstreamed patches

Replace some of the pending patches with the upstreamed versions and mark
them accordingly.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/microchipsw/patches-6.12/100-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch b/target/linux/microchipsw/patches-6.12/0093-v6.13-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch
similarity index 86%
rename from target/linux/microchipsw/patches-6.12/100-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch
rename to target/linux/microchipsw/patches-6.12/0093-v6.13-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch
index 1dfc08848ec7e847fda8534f9522d2f166198b36..b95304dc429a7a96eeaeb4502c22624fa0a7d70f 100644 (file)
--- a/target/linux/microchipsw/patches-6.12/100-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch
+++ b/target/linux/microchipsw/patches-6.12/0093-v6.13-clk-lan966x-make-it-selectable-for-ARCH_LAN969X.patch
@@ -1,7 +1,7 @@
-From 78d996ea8dbc6fa21ecb28d1b6167d6f2e0043cb Mon Sep 17 00:00:00 2001
+From e7b012cb4db7253d186fd485ab07c7346c645dab Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
 Date: Fri, 8 Nov 2024 12:22:34 +0100
-Subject: [PATCH 07/25] clk: lan966x: make it selectable for ARCH_LAN969X
+Subject: [PATCH] clk: lan966x: make it selectable for ARCH_LAN969X
 
 LAN969x uses the same LAN966x clock driver so make it selectable for
 ARCH_LAN969X.

diff --git a/target/linux/microchipsw/patches-6.12/102-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch b/target/linux/microchipsw/patches-6.12/0094-v6.20-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch
similarity index 62%
rename from target/linux/microchipsw/patches-6.12/102-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch
rename to target/linux/microchipsw/patches-6.12/0094-v6.20-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch
index c00f90913a8c70b59f8ecb23b0e3725f7b6f06b9..85bdd6e97f53bcca37561c2bc8980e366613df50 100644 (file)
--- a/target/linux/microchipsw/patches-6.12/102-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch
+++ b/target/linux/microchipsw/patches-6.12/0094-v6.20-phy-sparx5-serdes-make-it-selectable-for-ARCH_LAN969.patch
@@ -1,13 +1,17 @@
-From f11759a7a2c10d32324adf3cc5d4fe95ef74df77 Mon Sep 17 00:00:00 2001
+From d543d3eb06873f0ab8edb0d1f8364e9af93544a0 Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
-Date: Wed, 17 Sep 2025 12:55:14 +0200
-Subject: [PATCH 16/25] phy: sparx5-serdes: make it selectable for ARCH_LAN969X
+Date: Fri, 31 Oct 2025 13:18:12 +0100
+Subject: [PATCH] phy: sparx5-serdes: make it selectable for ARCH_LAN969X
 
 LAN969x uses the SparX-5 SERDES driver, so make it selectable for
 ARCH_LAN969X.
 
-Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 Reviewed-by: Daniel Machon <daniel.machon@microchip.com>
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Tested-by: Gabor Juhos <j4g8y7@gmail.com>
+Tested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
+Link: https://patch.msgid.link/20251031121834.665987-1-robert.marko@sartura.hr
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
 ---
  drivers/phy/microchip/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/microchipsw/patches-6.12/104-reset-sparx5-add-LAN969x-support.patch b/target/linux/microchipsw/patches-6.12/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
similarity index 82%
rename from target/linux/microchipsw/patches-6.12/104-reset-sparx5-add-LAN969x-support.patch
rename to target/linux/microchipsw/patches-6.12/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
index 92e02755ec96fb867b8260822e5d02eddbed41b1..154af04e3a7e6f938567e215e5b4642f250b8c9a 100644 (file)
--- a/target/linux/microchipsw/patches-6.12/104-reset-sparx5-add-LAN969x-support.patch
+++ b/target/linux/microchipsw/patches-6.12/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
@@ -1,6 +1,6 @@
-From f7a517f6f1c0ac240e2a2b2bae9c7efb4a92430a Mon Sep 17 00:00:00 2001
+From bf919ccfced7d47d14ec2d20ae465e8ae410aee6 Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
-Date: Tue, 5 Nov 2024 13:36:21 +0100
+Date: Mon, 22 Sep 2025 16:27:29 +0200
 Subject: [PATCH] reset: sparx5: add LAN969x support
 
 LAN969x uses the same reset configuration as LAN966x, but we need to
@@ -9,6 +9,7 @@ allow compiling it when ARCH_LAN969X is selected.
 A fallback compatible to LAN966x will be used.
 
 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
 ---
  drivers/reset/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/microchipsw/patches-6.12/900-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch b/target/linux/microchipsw/patches-6.12/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
similarity index 84%
rename from target/linux/microchipsw/patches-6.12/900-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
rename to target/linux/microchipsw/patches-6.12/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
index 90694513155aef42737710f077faf4f6cdb738a1..f9d56a42d675ff7b3989359c5e4258beaa4abe09 100644 (file)
--- a/target/linux/microchipsw/patches-6.12/900-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
+++ b/target/linux/microchipsw/patches-6.12/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
@@ -1,17 +1,22 @@
-From cb65fd2bb68fdbf719d1ce08b11b92d431be8a84 Mon Sep 17 00:00:00 2001
+From d3824968dbd9056844bbd5041020a3e28c748558 Mon Sep 17 00:00:00 2001
 From: Tony Han <tony.han@microchip.com>
-Date: Tue, 12 Dec 2023 13:32:42 +0800
+Date: Wed, 3 Dec 2025 13:11:43 +0100
 Subject: [PATCH] dmaengine: at_xdmac: get the number of DMA channels from
  device tree
 
 In case of kernel runs in non-secure mode, the number of DMA channels can
 be got from device tree since the value read from GTYPE register is "0" as
 it's always secured.
+
 As the number of channels can never be negative, update them to the type
 "unsigned".
 
+This is required for LAN969x.
+
 Signed-off-by: Tony Han <tony.han@microchip.com>
-Reviewed-by: Cristian Birsan <cristian.birsan@microchip.com>
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Link: https://patch.msgid.link/20251203121208.1269487-1-robert.marko@sartura.hr
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
 ---
  drivers/dma/at_xdmac.c | 26 +++++++++++++++++++++++---
  1 file changed, 23 insertions(+), 3 deletions(-)