microchipsw: use upstreamed NVMEM support

NVMEM OTP support was upstreamed, so backport those patches instead of
our downstream ones.

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

diff --git a/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch b/target/linux/microchipsw/patches-6.18/0011-v7.2-nvmem-lan9662-otp-add-support-for-LAN969x.patch
similarity index 92%
rename from target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch
rename to target/linux/microchipsw/patches-6.18/0011-v7.2-nvmem-lan9662-otp-add-support-for-LAN969x.patch
index bdd388fc7d82e30d0ea01d00f03d53cecda62bb4..bece0a7ff92e2dc84fb791834fbae80f25b558f2 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch
+++ b/target/linux/microchipsw/patches-6.18/0011-v7.2-nvmem-lan9662-otp-add-support-for-LAN969x.patch
@@ -1,6 +1,6 @@
-From 7ec8c81eae48ceb1e07a00be65716769827b747e Mon Sep 17 00:00:00 2001
+From 0b9467918f64d573f491089f7132c0f77ac62aec Mon Sep 17 00:00:00 2001
 From: Horatiu Vultur <horatiu.vultur@microchip.com>
-Date: Wed, 3 Jan 2024 11:10:44 +0100
+Date: Fri, 15 May 2026 13:59:08 +0200
 Subject: [PATCH] nvmem: lan9662-otp: add support for LAN969x
 
 Microchip LAN969x provides OTP with the same control logic, only the size
@@ -8,6 +8,7 @@ differs as LAN969x has 16KB of OTP instead of 8KB like on LAN966x.
 
 Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Signed-off-by: Srinivas Kandagatla <srini@kernel.org>
 ---
  drivers/nvmem/Kconfig        |  2 +-
  drivers/nvmem/lan9662-otpc.c | 12 +++++++++---

diff --git a/target/linux/microchipsw/patches-6.18/124-arm64-dts-microchip-lan969x-add-OTP-node.patch b/target/linux/microchipsw/patches-6.18/0012-v7.2-arm64-dts-microchip-lan969x-add-OTP-node.patch
similarity index 63%
rename from target/linux/microchipsw/patches-6.18/124-arm64-dts-microchip-lan969x-add-OTP-node.patch
rename to target/linux/microchipsw/patches-6.18/0012-v7.2-arm64-dts-microchip-lan969x-add-OTP-node.patch
index 48571cd283d5aa379feaf2d08ff7f46c0ee95e50..5dd8720d620c7455eac65812b943a667d16ccd3b 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/124-arm64-dts-microchip-lan969x-add-OTP-node.patch
+++ b/target/linux/microchipsw/patches-6.18/0012-v7.2-arm64-dts-microchip-lan969x-add-OTP-node.patch
@@ -1,11 +1,14 @@
-From 477b5c9af4bb7c68bd4ec4807c94dac5a90dcd2f Mon Sep 17 00:00:00 2001
+From 8071815790141d3f05e32b972a6c79fdbbb88cfa Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
-Date: Fri, 24 Oct 2025 18:46:46 +0200
-Subject: [PATCH 124/124] arm64: dts: microchip: lan969x: add OTP node
+Date: Fri, 15 May 2026 13:59:09 +0200
+Subject: [PATCH] arm64: dts: microchip: lan969x: add OTP node
 
 Add the required OTP on LAN969x.
 
 Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+Reviewed-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
+Link: https://lore.kernel.org/r/20260515115954.701155-3-robimarko@gmail.com
+Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
 ---
  arch/arm64/boot/dts/microchip/lan9691.dtsi | 5 +++++
  1 file changed, 5 insertions(+)

diff --git a/target/linux/microchipsw/patches-6.18/122-arm64-dts-microchip-lan969x-add-QSPI-nodes.patch b/target/linux/microchipsw/patches-6.18/122-arm64-dts-microchip-lan969x-add-QSPI-nodes.patch
index f05ea44deab2d0763c939b43bbfac0227be03048..4488cf8bd73996a61621a07e746fddc4b47a317b 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/122-arm64-dts-microchip-lan969x-add-QSPI-nodes.patch
+++ b/target/linux/microchipsw/patches-6.18/122-arm64-dts-microchip-lan969x-add-QSPI-nodes.patch
@@ -12,7 +12,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/arch/arm64/boot/dts/microchip/lan9691.dtsi
 +++ b/arch/arm64/boot/dts/microchip/lan9691.dtsi
-@@ -391,6 +391,36 @@
+@@ -396,6 +396,36 @@
                        clock-names = "cpu", "ddr", "sys";
                };
  

diff --git a/target/linux/microchipsw/patches-6.18/123-arm64-dts-microchip-lan969x-add-SDMMC-nodes.patch b/target/linux/microchipsw/patches-6.18/123-arm64-dts-microchip-lan969x-add-SDMMC-nodes.patch
index f44ee1d4d1b22cbb6b005f416d9b7e4815ad9cc9..cabc1dc68d4d9a5919f1b49310285e7498a7b282 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/123-arm64-dts-microchip-lan969x-add-SDMMC-nodes.patch
+++ b/target/linux/microchipsw/patches-6.18/123-arm64-dts-microchip-lan969x-add-SDMMC-nodes.patch
@@ -12,7 +12,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/arch/arm64/boot/dts/microchip/lan9691.dtsi
 +++ b/arch/arm64/boot/dts/microchip/lan9691.dtsi
-@@ -406,6 +406,28 @@
+@@ -411,6 +411,28 @@
                        status = "disabled";
                };