aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.10
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2022-07-08 07:58:20 +0200
committerRafał Miłecki <rafal@milecki.pl>2022-07-08 10:19:53 +0200
commit41e1e838fbbb0308ad7353a3714e04b8c4585e7e (patch)
tree2990477f9f9582ed12829d37c6b5a25894311c1a /target/linux/ath79/patches-5.10
parent639419ec4fd1501a9b9857cea96474271ef737b1 (diff)
downloadupstream-41e1e838fbbb0308ad7353a3714e04b8c4585e7e.tar.gz
upstream-41e1e838fbbb0308ad7353a3714e04b8c4585e7e.tar.bz2
upstream-41e1e838fbbb0308ad7353a3714e04b8c4585e7e.zip
kernel: backport mtd patch adding of_platform_populate() calls
This is required for non-parser drivers handling MTD devices. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/ath79/patches-5.10')
-rw-r--r--target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 38a65b183f..d7ee9e56fc 100644
--- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
-@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -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);
@@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret;
int i;
-@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3195,7 +3196,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;
@@ -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
-@@ -778,6 +778,17 @@ out_error:
+@@ -788,6 +788,17 @@ out_error:
*/
static void mtd_set_dev_defaults(struct mtd_info *mtd)
{