diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-24 20:59:54 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-02 23:37:19 +0100 |
| commit | ff504e6fd118ab2e55492a138d0907dc2a943057 (patch) | |
| tree | c196a63d10927e6a41d51dbac1c01bf981f0c9e0 /target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch | |
| parent | 9b96fcf9f6369982668d1d4cf68dca9453d28a56 (diff) | |
| download | upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.tar.gz upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.tar.bz2 upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.zip | |
pistachio: Make kernel 5.10 patches apply
Make the patches apply on kernel 5.10 and refresh the patches and the
kernel configuration on top of kernel 5.10.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch')
| -rw-r--r-- | target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch | 16 |
1 files changed, 8 insertions, 8 deletions
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 69a8303d2b..e8cb2f2fe1 100644 --- 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 +@@ -3183,6 +3183,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); +@@ -3237,7 +3238,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: +@@ -778,6 +778,17 @@ out_error: */ static void mtd_set_dev_defaults(struct mtd_info *mtd) { |