kernel: bump 5.4 to 5.4.77
[openwrt/staging/rmilecki.git] / target / linux / pistachio / patches-5.4 / 401-mtd-nor-support-mtd-name-from-device-tree.patch
index 4b600d7e8a6ab52d38c7b5b05056634d2ca8a181..f156e968af73ef0d45efab0cac0d6a48e68221cc 100644 (file)
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -4931,6 +4931,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -4930,6 +4930,7 @@ int spi_nor_scan(struct spi_nor *nor, co
        struct mtd_info *mtd = &nor->mtd;
        struct device_node *np = spi_nor_get_flash_node(nor);
        struct spi_nor_flash_parameter *params = &nor->params;
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
        int ret;
        int i;
  
-@@ -4993,7 +4994,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -4992,7 +4993,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);