aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-09-24 19:01:52 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-09-24 19:01:52 +0200
commit35985454a6032bfac0d29b9976d856a89580c01c (patch)
tree2bcb0dcde8818a0a98c7c571292ec89ee050c5bb /target/linux/pistachio/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
parent92a0dd2447bda9a6d5440f4a94d9b617406e3f76 (diff)
downloadupstream-35985454a6032bfac0d29b9976d856a89580c01c.tar.gz
upstream-35985454a6032bfac0d29b9976d856a89580c01c.tar.bz2
upstream-35985454a6032bfac0d29b9976d856a89580c01c.zip
kernel: bump 5.10 to 5.10.196
Removed because already in upstream: target/linux/bcm53xx/patches-5.10/030-v5.11-0002-ARM-dts-BCM5301X-Harmonize-EHCI-OHCI-DT-nodes-name.patch target/linux/bcm53xx/patches-5.10/033-v5.16-0019-ARM-dts-BCM53573-Describe-on-SoC-BCM53125-rev-4-swit.patch target/linux/bcm53xx/patches-5.10/040-v6.6-0005-ARM-dts-BCM53573-Drop-nonexistent-usb-cells.patch target/linux/bcm53xx/patches-5.10/040-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch target/linux/bcm53xx/patches-5.10/040-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch target/linux/bcm53xx/patches-5.10/040-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch All other patches automatically rebased. 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.patch4
1 files changed, 2 insertions, 2 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 2df15d0ce9..f1a626c700 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
@@ -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
-@@ -3168,6 +3168,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3169,6 +3169,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;
-@@ -3222,7 +3223,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3223,7 +3224,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;