pistachio: update and extend 6.1 patches

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

diff --git a/target/linux/pistachio/patches-6.1/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-6.1/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 36f5331bd017f9727185889f33f0575c93397952..b30f79b77388dd8529a83cf06ba2da5f2d83f74c 100644 (file)
--- a/target/linux/pistachio/patches-6.1/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-6.1/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,19 +10,18 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -3108,6 +3108,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-       struct device *dev = nor->dev;
+@@ -2942,12 +2942,20 @@ static void spi_nor_set_mtd_info(struct
+ {
        struct mtd_info *mtd = &nor->mtd;
-       struct device_node *np = spi_nor_get_flash_node(nor);
+       struct device *dev = nor->dev;
++      struct device_node *np = spi_nor_get_flash_node(nor);
 +      const char __maybe_unused *of_mtd_name = NULL;
-       int ret;
-       int i;
  
-@@ -3162,7 +3163,12 @@ int spi_nor_scan(struct spi_nor *nor, co
-       if (ret)
-               return ret;
+       spi_nor_set_mtd_locking_ops(nor);
+       spi_nor_set_mtd_otp_ops(nor);
  
--      if (!mtd->name)
+       mtd->dev.parent = dev;
+       if (!mtd->name)
 +#ifdef CONFIG_MTD_OF_PARTS
 +      of_property_read_string(np, "linux,mtd-name", &of_mtd_name);
 +#endif
@@ -30,11 +29,11 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 +              mtd->name = of_mtd_name;
 +      else if (!mtd->name)
                mtd->name = dev_name(dev);
-       mtd->priv = nor;
        mtd->type = MTD_NORFLASH;
+       mtd->flags = MTD_CAP_NORFLASH;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -870,6 +870,17 @@ out_error:
+@@ -863,6 +863,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {