diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-28 19:09:19 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-28 19:26:47 +0100 |
commit | 4292832a6a836aa89bf39675193c9c60870ed862 (patch) | |
tree | bb93329bfb6149667b0492b1d530ff77c9da4549 /target/linux/pistachio | |
parent | ac7386a15d1f050853e5160b5dc2227e200ec807 (diff) | |
download | upstream-4292832a6a836aa89bf39675193c9c60870ed862.tar.gz upstream-4292832a6a836aa89bf39675193c9c60870ed862.tar.bz2 upstream-4292832a6a836aa89bf39675193c9c60870ed862.zip |
kernel: bump 5.4 to 5.4.230
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio')
-rw-r--r-- | target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch | 6 |
1 files changed, 3 insertions, 3 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 7d216477db..47774edc6a 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,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 -@@ -4939,6 +4939,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4941,6 +4941,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; -@@ -5001,7 +5002,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -5003,7 +5004,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); @@ -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 -@@ -834,6 +834,17 @@ out_error: +@@ -836,6 +836,17 @@ out_error: */ static void mtd_set_dev_defaults(struct mtd_info *mtd) { |