diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-05-14 13:58:11 +0100 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2021-05-14 14:50:03 +0100 |
commit | d337731f85c880acc96e8a6b99b62aeb57b8253f (patch) | |
tree | 44e65ab0dad99c245db8d0eea7031ebf962c2e82 /target/linux/bmips | |
parent | 6a57e1fbfc39a47e8a2dbe243953c7fc5e3fa4dc (diff) | |
download | upstream-d337731f85c880acc96e8a6b99b62aeb57b8253f.tar.gz upstream-d337731f85c880acc96e8a6b99b62aeb57b8253f.tar.bz2 upstream-d337731f85c880acc96e8a6b99b62aeb57b8253f.zip |
kernel: bump 5.10 to 5.10.37
Automatically refreshed:
ath79/patches-5.10/0032-MIPS-ath79-sanitize-symbols.patch
bcm63xx/patches-5.10/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
bcm63xx/patches-5.10/434-nand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch
bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch
bmips/patches-5.10/041-v5.13-mtd-rawnand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch
bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch
bmips/patches-5.10/600-mips-bmips-add-pci-support.patch
generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
generic/hack-5.10/301-mips_image_cmdline_hack.patch
generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
generic/hack-5.10/902-debloat_proc.patch
generic/pending-5.10/300-mips_expose_boot_raw.patch
generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch
generic/pending-5.10/630-packet_socket_type.patch
ipq806x/patches-5.10/0072-add-ipq806x-with-no-clocks.patch
ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
lantiq/patches-5.10/0001-MIPS-lantiq-add-pcie-driver.patch
lantiq/patches-5.10/0023-NET-PHY-add-led-support-for-intel-xway.patch
lantiq/patches-5.10/0152-lantiq-VPE.patch
Deleted (reverse-appliable):
bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch
generic/backport-5.10/499-v5.13-mtd-don-t-lock-when-recursively-deleting-partitions.patch
Deleted (alternative upstream fix):
ramips/patches-5.10/330-fix-pci-init-mt7620.patch
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/bmips')
5 files changed, 6 insertions, 51 deletions
diff --git a/target/linux/bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch b/target/linux/bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch index b8601ec1bf..a2e92bcafd 100644 --- a/target/linux/bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch +++ b/target/linux/bmips/patches-5.10/001-v5.11-mips-bmips-select-ARCH_HAS_RESET_CONTROLLER.patch @@ -17,7 +17,7 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -249,6 +249,7 @@ config ATH79 +@@ -250,6 +250,7 @@ config ATH79 config BMIPS_GENERIC bool "Broadcom Generic BMIPS kernel" diff --git a/target/linux/bmips/patches-5.10/041-v5.13-mtd-rawnand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch b/target/linux/bmips/patches-5.10/041-v5.13-mtd-rawnand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch index a4c61c8715..00669843d8 100644 --- a/target/linux/bmips/patches-5.10/041-v5.13-mtd-rawnand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch +++ b/target/linux/bmips/patches-5.10/041-v5.13-mtd-rawnand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch @@ -23,9 +23,9 @@ Link: https://lore.kernel.org/linux-mtd/20210224080210.23686-1-noltari@gmail.com --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -2688,6 +2688,12 @@ static int brcmnand_attach_chip(struct n - - ret = brcmstb_choose_ecc_layout(host); +@@ -2694,6 +2694,12 @@ static int brcmnand_attach_chip(struct n + chip->ecc.read_oob = brcmnand_read_oob_raw; + } + /* If OOB is written with ECC enabled it will cause ECC errors */ + if (is_hamming_ecc(host->ctrl, &host->hwcfg)) { diff --git a/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch b/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch deleted file mode 100644 index b0093e9216..0000000000 --- a/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9c7d24693d864f90b27aad5d15fbfe226c02898b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> -Date: Wed, 24 Mar 2021 09:19:02 +0100 -Subject: [PATCH 01/22] gpio: guard gpiochip_irqchip_add_domain() with - GPIOLIB_IRQCHIP -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The current code doesn't check if GPIOLIB_IRQCHIP is enabled, which results in -a compilation error when trying to build gpio-regmap if CONFIG_GPIOLIB_IRQCHIP -isn't enabled. - -Fixes: 6a45b0e2589f ("gpiolib: Introduce gpiochip_irqchip_add_domain()") -Suggested-by: Michael Walle <michael@walle.cc> -Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> -Reviewed-by: Linus Walleij <linus.walleij@linaro.org> -Reviewed-by: Michael Walle <michael@walle.cc> -Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> -Link: https://lore.kernel.org/r/20210324081923.20379-2-noltari@gmail.com -Signed-off-by: Linus Walleij <linus.walleij@linaro.org> ---- - include/linux/gpio/driver.h | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/include/linux/gpio/driver.h -+++ b/include/linux/gpio/driver.h -@@ -637,8 +637,17 @@ int gpiochip_irqchip_add_key(struct gpio - bool gpiochip_irqchip_irq_valid(const struct gpio_chip *gc, - unsigned int offset); - -+#ifdef CONFIG_GPIOLIB_IRQCHIP - int gpiochip_irqchip_add_domain(struct gpio_chip *gc, - struct irq_domain *domain); -+#else -+static inline int gpiochip_irqchip_add_domain(struct gpio_chip *gc, -+ struct irq_domain *domain) -+{ -+ WARN_ON(1); -+ return -EINVAL; -+} -+#endif - - #ifdef CONFIG_LOCKDEP - diff --git a/target/linux/bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch b/target/linux/bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch index 09b494197b..9b4674dbed 100644 --- a/target/linux/bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch +++ b/target/linux/bmips/patches-5.10/202-mips-bmips-disable-ARCH_HAS_SYNC_DMA_FOR_CPU_ALL.patch @@ -52,7 +52,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -250,7 +250,6 @@ config ATH79 +@@ -251,7 +251,6 @@ config ATH79 config BMIPS_GENERIC bool "Broadcom Generic BMIPS kernel" select ARCH_HAS_RESET_CONTROLLER diff --git a/target/linux/bmips/patches-5.10/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-5.10/600-mips-bmips-add-pci-support.patch index b4e7b7cfca..961e95e52a 100644 --- a/target/linux/bmips/patches-5.10/600-mips-bmips-add-pci-support.patch +++ b/target/linux/bmips/patches-5.10/600-mips-bmips-add-pci-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -262,6 +262,7 @@ config BMIPS_GENERIC +@@ -263,6 +263,7 @@ config BMIPS_GENERIC select BCM7038_L1_IRQ select BCM7120_L2_IRQ select BRCMSTB_L2_IRQ |