aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
diff options
context:
space:
mode:
authorNick Hainke <vincent@systemli.org>2022-09-28 14:14:13 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-01-24 00:30:47 +0100
commit496d32cb7827e12c0432d5310dc52220d7aed390 (patch)
tree8eee98d1032a7f8f49b30b2a8498097aa2190dda /target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
parent94059ce86412b0ed5589d79661bceb1d2ea443af (diff)
downloadupstream-496d32cb7827e12c0432d5310dc52220d7aed390.tar.gz
upstream-496d32cb7827e12c0432d5310dc52220d7aed390.tar.bz2
upstream-496d32cb7827e12c0432d5310dc52220d7aed390.zip
pistachio: add 5.15 testing kernel
Manually refreshed: - 903-MIPS-DTS-img-marduk-Add-NXP-SC16IS752IPW.patch - 905-MIPS-DTS-img-marduk-Add-led-aliases.patch (led node was renamed to led-1) Automatically refreshed: - 109-MIPS-DTS-img-marduk-switch-mmc-to-1-bit-mode.patch - 401-mtd-nor-support-mtd-name-from-device-tree.patch - 901-MIPS-DTS-img-marduk-Add-SPI-NAND-flash.patch - 902-MIPS-DTS-img-marduk-Add-Cascoda-CA8210-6LoWPAN.patch - 904-MIPS-DTS-img-marduk-Add-partition-name.patch Enable testing kernel. Co-Developed-by: Hauke Mehrtens <hauke@hauke-m.de> Tested-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch')
-rw-r--r--target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
index c6569c81ce..da3ca270fa 100644
--- a/target/linux/pistachio/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/pistachio/patches-5.15/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
-@@ -3143,6 +3143,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3098,6 +3098,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;
-@@ -3197,7 +3198,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3152,7 +3153,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
-@@ -850,6 +850,17 @@ out_error:
+@@ -847,6 +847,17 @@ out_error:
*/
static void mtd_set_dev_defaults(struct mtd_info *mtd)
{