aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-02-03 21:09:56 -0500
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-02-04 22:07:32 +0100
commit36c9cf3e51c563d350207b16edee111485d3e04b (patch)
tree1a112bb4aa5d332f30d715d5506c0f365d1ced0c /target
parent43ff6e641e7c321ab3b67c43ba73a6877d8f0439 (diff)
downloadupstream-36c9cf3e51c563d350207b16edee111485d3e04b.tar.gz
upstream-36c9cf3e51c563d350207b16edee111485d3e04b.tar.bz2
upstream-36c9cf3e51c563d350207b16edee111485d3e04b.zip
kernel: bump 5.4 to 5.4.95
Ran update_kernel.sh in a fresh clone without any existing toolchains. Removed upstreamed patches: imx6: 303-ARM-dts-imx6qdl-gw52xx-fix-duplicate-regulator-namin.patch Build system: x86_64 Build-tested: ipq806x/R7800, bcm27xx/bcm2711 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch2
-rw-r--r--target/linux/imx6/patches-5.4/303-ARM-dts-imx6qdl-gw52xx-fix-duplicate-regulator-namin.patch37
2 files changed, 1 insertions, 38 deletions
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
index dfc16a7ba1..c7bcc29372 100644
--- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
@@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3973,14 +3973,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3975,14 +3975,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
diff --git a/target/linux/imx6/patches-5.4/303-ARM-dts-imx6qdl-gw52xx-fix-duplicate-regulator-namin.patch b/target/linux/imx6/patches-5.4/303-ARM-dts-imx6qdl-gw52xx-fix-duplicate-regulator-namin.patch
deleted file mode 100644
index c459e6f11c..0000000000
--- a/target/linux/imx6/patches-5.4/303-ARM-dts-imx6qdl-gw52xx-fix-duplicate-regulator-namin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 069abe403d4eba85eccea16f8b72186a89a68bb1 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Thu, 7 Jan 2021 10:06:03 +0100
-Subject: [PATCH] ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
-
-2 regulator descriptions carry identical naming.
-
-This leads to following boot warning:
-[ 0.173138] debugfs: Directory 'vdd1p8' with parent 'regulator' already present!
-
-Fix this by renaming the one used for audio.
-
-Fixes: 5051bff33102 ("ARM: dts: imx: ventana: add LTC3676 PMIC support")
-Signed-off-by: Tim Harvey <tharvey@gateworks.com>
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Cc: Fabio Estevam <festevam@gmail.com>
-Cc: Rob Herring <robh+dt@kernel.org>
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Cc: NXP Linux Team <linux-imx@nxp.com>
-Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
-Cc: stable@vger.kernel.org # v4.11
----
- arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
-@@ -273,7 +273,7 @@
-
- /* VDD_AUD_1P8: Audio codec */
- reg_aud_1p8v: ldo3 {
-- regulator-name = "vdd1p8";
-+ regulator-name = "vdd1p8a";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-boot-on;