diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-09 19:47:17 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-21 11:46:13 +0200 |
| commit | 3cd9219e5e16aa38606ea82e4fadb1e0f5f39743 (patch) | |
| tree | 6f7aa5b238f4e434c7ce3dab11bee2ac002313ef /target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch | |
| parent | 4291a0d58a506f4e2f32de7918c3fc72145053ce (diff) | |
| download | upstream-3cd9219e5e16aa38606ea82e4fadb1e0f5f39743.tar.gz upstream-3cd9219e5e16aa38606ea82e4fadb1e0f5f39743.tar.bz2 upstream-3cd9219e5e16aa38606ea82e4fadb1e0f5f39743.zip | |
pistachio: Make patches and configuration apply on to of 5.4
This refreshes the patches, removes patches already applied upstream and
removes the SPI NAND framework to use the upstream version.
In addition it also refreshes the kernel configuration.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch')
| -rw-r--r-- | target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch index 065a0b77bc..5d2f9284ab 100644 --- a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,17 +10,17 @@ 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 -@@ -2671,6 +2671,7 @@ int spi_nor_scan(struct spi_nor *nor, co - struct device *dev = nor->dev; +@@ -4931,6 +4931,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; + const char __maybe_unused *of_mtd_name = NULL; int ret; int i; -@@ -2746,7 +2747,12 @@ int spi_nor_scan(struct spi_nor *nor, co - spi_nor_wait_till_ready(nor); - } +@@ -4993,7 +4994,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); - if (!mtd->name) +#ifdef CONFIG_MTD_OF_PARTS |