kernel: bump 5.10 to 5.10.147

[openwrt/openwrt.git] / target / linux / pistachio / patches-5.10 / 401-mtd-nor-support-mtd-name-from-device-tree.patch

diff --git a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 69a8303d2bc3a459850798a629cdb29da70603d5..62f610492ff52f099d408da217ac9a2fb8da95a6 100644 (file)
--- a/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -8,19 +8,19 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
  drivers/mtd/spi-nor/spi-nor.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
 
---- a/drivers/mtd/spi-nor/spi-nor.c
-+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -4938,6 +4938,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+--- a/drivers/mtd/spi-nor/core.c
++++ b/drivers/mtd/spi-nor/core.c
+@@ -3141,6 +3141,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+       struct device *dev = nor->dev;
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);
-       struct spi_nor_flash_parameter *params = &nor->params;
 +      const char __maybe_unused *of_mtd_name = NULL;
        int ret;
        int i;
  
-@@ -5000,7 +5001,12 @@ int spi_nor_scan(struct spi_nor *nor, co
-       /* Init flash parameters based on flash_info struct and SFDP */
-       spi_nor_init_params(nor);
+@@ -3195,7 +3196,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+       if (ret)
+               return ret;
  
 -      if (!mtd->name)
 +#ifdef CONFIG_MTD_OF_PARTS
@@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
        mtd->type = MTD_NORFLASH;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -779,6 +779,17 @@ out_error:
+@@ -851,6 +851,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {