aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-07-03 15:26:59 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-03 18:54:04 +0200
commitee67afeda9eb2f4b0b779e2969421ce96c27e720 (patch)
treea6ffd2a06628fc452148fba044acc2c0f780fa4d /target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
parent32e90956623f736e992dfa4fdefd9657f0cd4f4a (diff)
downloadupstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.tar.gz
upstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.tar.bz2
upstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.zip
kernel: Refresh patches for all targets
This refreshes the patches on top of kernel 5.4.127. Deleted (upstreamed): bcm27xx/patches-5.10/950-0005-Revert-mailbox-avoid-timer-start-from-callback.patch [0] bcm27xx/patches-5.10/950-0678-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch [1] Needed manual modifications: bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=bb2220e0672b7433a9a42618599cd261b2629240 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=83603802954068ccd1b8a3f2ccbbaf5e0862acb0 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch')
-rw-r--r--target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 38a65b183f..4677821b83 100644
--- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/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
-@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3157,6 +3157,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;
-@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -3211,7 +3212,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
-@@ -778,6 +778,17 @@ out_error:
+@@ -788,6 +788,17 @@ out_error:
*/
static void mtd_set_dev_defaults(struct mtd_info *mtd)
{