[openwrt/openwrt] pistachio: 6.12: refresh patches and kernel config

[LEDE Commits]

wigyori pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/d6b57d47227b57206bc007a637696aab5a7e46cd

commit d6b57d47227b57206bc007a637696aab5a7e46cd
Author: Zoltan HERPAI <wigyori at uid0.hu>
AuthorDate: Thu May 29 12:35:12 2025 +0000

    pistachio: 6.12: refresh patches and kernel config
    
    Refresh patches and configs as required.
    
    Signed-off-by: Zoltan HERPAI <wigyori at uid0.hu>
---
 target/linux/pistachio/config-6.12                                  | 1 +
 .../401-mtd-nor-support-mtd-name-from-device-tree.patch             | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/target/linux/pistachio/config-6.12 b/target/linux/pistachio/config-6.12
index 69c566a1e8..d608211a7f 100644
--- a/target/linux/pistachio/config-6.12
+++ b/target/linux/pistachio/config-6.12
@@ -198,6 +198,7 @@ CONFIG_MMC_DW=y
 # CONFIG_MMC_DW_BLUEFIELD is not set
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_HI3798CV200 is not set
+# CONFIG_MMC_DW_HI3798MV200 is not set
 # CONFIG_MMC_DW_K3 is not set
 CONFIG_MMC_DW_PLTFM=y
 CONFIG_MMU_LAZY_TLB_REFCOUNT=y
diff --git a/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 0000c22a89..ff686e03a7 100644
--- a/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-6.12/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
 
 --- a/drivers/spi/spi-mem.c
 +++ b/drivers/spi/spi-mem.c
-@@ -846,7 +846,9 @@ static int spi_mem_probe(struct spi_devi
+@@ -893,7 +893,9 @@ static int spi_mem_probe(struct spi_devi
  {
  	struct spi_mem_driver *memdrv = to_spi_mem_drv(spi->dev.driver);
  	struct spi_controller *ctlr = spi->controller;
@@ -20,7 +20,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
  
  	mem = devm_kzalloc(&spi->dev, sizeof(*mem), GFP_KERNEL);
  	if (!mem)
-@@ -854,10 +856,15 @@ static int spi_mem_probe(struct spi_devi
+@@ -901,10 +903,15 @@ static int spi_mem_probe(struct spi_devi
  
  	mem->spi = spi;
  
@@ -41,7 +41,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
  		return PTR_ERR_OR_ZERO(mem->name);
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -870,6 +870,17 @@ out_error:
+@@ -872,6 +872,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {