]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Fixes for 5.4
authorSasha Levin <sashal@kernel.org>
Sun, 6 Jun 2021 22:38:50 +0000 (18:38 -0400)
committerSasha Levin <sashal@kernel.org>
Sun, 6 Jun 2021 22:38:50 +0000 (18:38 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-5.4/arm-dts-imx-emcon-avari-fix-nxp-pca8574-gpio-cells.patch [new file with mode: 0644]
queue-5.4/arm-dts-imx7d-meerkat96-fix-the-tuning-step-property.patch [new file with mode: 0644]
queue-5.4/arm-dts-imx7d-pico-fix-the-tuning-step-property.patch [new file with mode: 0644]
queue-5.4/arm64-dts-ls1028a-fix-memory-node.patch [new file with mode: 0644]
queue-5.4/arm64-dts-zii-ultra-fix-12v_main-voltage.patch [new file with mode: 0644]
queue-5.4/bus-ti-sysc-fix-flakey-idling-of-uarts-and-stop-usin.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/arm-dts-imx-emcon-avari-fix-nxp-pca8574-gpio-cells.patch b/queue-5.4/arm-dts-imx-emcon-avari-fix-nxp-pca8574-gpio-cells.patch
new file mode 100644 (file)
index 0000000..6173326
--- /dev/null
@@ -0,0 +1,36 @@
+From b8c006f44a2d655e0852b33819ba5b0c3b48fa34 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 21 May 2021 09:54:07 +0200
+Subject: ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells
+
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+
+[ Upstream commit b73eb6b3b91ff7d76cff5f8c7ab92fe0c51e3829 ]
+
+According to the DT bindings, #gpio-cells must be two.
+
+Fixes: 63e71fedc07c4ece ("ARM: dts: Add support for emtrion emCON-MX6 series")
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi b/arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi
+index 828cf3e39784..c4e146f3341b 100644
+--- a/arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi
++++ b/arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi
+@@ -126,7 +126,7 @@
+               compatible = "nxp,pca8574";
+               reg = <0x3a>;
+               gpio-controller;
+-              #gpio-cells = <1>;
++              #gpio-cells = <2>;
+       };
+ };
+-- 
+2.30.2
+
diff --git a/queue-5.4/arm-dts-imx7d-meerkat96-fix-the-tuning-step-property.patch b/queue-5.4/arm-dts-imx7d-meerkat96-fix-the-tuning-step-property.patch
new file mode 100644 (file)
index 0000000..fb197a8
--- /dev/null
@@ -0,0 +1,38 @@
+From c1737271fb0705ca207380d54305068a10b522fa Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 20 May 2021 18:42:12 -0300
+Subject: ARM: dts: imx7d-meerkat96: Fix the 'tuning-step' property
+
+From: Fabio Estevam <festevam@gmail.com>
+
+[ Upstream commit 7c8f0338cdacc90fdf6468adafa8e27952987f00 ]
+
+According to Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml, the
+correct name of the property is 'fsl,tuning-step'.
+
+Fix it accordingly.
+
+Signed-off-by: Fabio Estevam <festevam@gmail.com>
+Fixes: ae7b3384b61b ("ARM: dts: Add support for 96Boards Meerkat96 board")
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/imx7d-meerkat96.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx7d-meerkat96.dts b/arch/arm/boot/dts/imx7d-meerkat96.dts
+index 5339210b63d0..dd8003bd1fc0 100644
+--- a/arch/arm/boot/dts/imx7d-meerkat96.dts
++++ b/arch/arm/boot/dts/imx7d-meerkat96.dts
+@@ -193,7 +193,7 @@
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+       keep-power-in-suspend;
+-      tuning-step = <2>;
++      fsl,tuning-step = <2>;
+       vmmc-supply = <&reg_3p3v>;
+       no-1-8-v;
+       broken-cd;
+-- 
+2.30.2
+
diff --git a/queue-5.4/arm-dts-imx7d-pico-fix-the-tuning-step-property.patch b/queue-5.4/arm-dts-imx7d-pico-fix-the-tuning-step-property.patch
new file mode 100644 (file)
index 0000000..0d84ac7
--- /dev/null
@@ -0,0 +1,38 @@
+From 834f9e2131e3c65062b437e3d74997fb7fb2f991 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 20 May 2021 18:42:13 -0300
+Subject: ARM: dts: imx7d-pico: Fix the 'tuning-step' property
+
+From: Fabio Estevam <festevam@gmail.com>
+
+[ Upstream commit 0e2fa4959c4f44815ce33e46e4054eeb0f346053 ]
+
+According to Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.yaml, the
+correct name of the property is 'fsl,tuning-step'.
+
+Fix it accordingly.
+
+Signed-off-by: Fabio Estevam <festevam@gmail.com>
+Fixes: f13f571ac8a1 ("ARM: dts: imx7d-pico: Extend peripherals support")
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/imx7d-pico.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
+index 6f50ebf31a0a..8a8df54ff563 100644
+--- a/arch/arm/boot/dts/imx7d-pico.dtsi
++++ b/arch/arm/boot/dts/imx7d-pico.dtsi
+@@ -307,7 +307,7 @@
+       pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+       cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+       bus-width = <4>;
+-      tuning-step = <2>;
++      fsl,tuning-step = <2>;
+       vmmc-supply = <&reg_3p3v>;
+       wakeup-source;
+       no-1-8-v;
+-- 
+2.30.2
+
diff --git a/queue-5.4/arm64-dts-ls1028a-fix-memory-node.patch b/queue-5.4/arm64-dts-ls1028a-fix-memory-node.patch
new file mode 100644 (file)
index 0000000..eeb65d3
--- /dev/null
@@ -0,0 +1,48 @@
+From 8dd87824537c8268b38df57201f9f2ffca859e44 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 8 Apr 2021 13:02:18 +0200
+Subject: arm64: dts: ls1028a: fix memory node
+
+From: Michael Walle <michael@walle.cc>
+
+[ Upstream commit dabea675faf16e8682aa478ff3ce65dd775620bc ]
+
+While enabling EDAC support for the LS1028A it was discovered that the
+memory node has a wrong endianness setting as well as a wrong interrupt
+assignment. Fix both.
+
+This was tested on a sl28 board. To force ECC errors, you can use the
+error injection supported by the controller in hardware (with
+CONFIG_EDAC_DEBUG enabled):
+
+ # enable error injection
+ $ echo 0x100 > /sys/devices/system/edac/mc/mc0/inject_ctrl
+ # flip lowest bit of the data
+ $ echo 0x1 > /sys/devices/system/edac/mc/mc0/inject_data_lo
+
+Fixes: 8897f3255c9c ("arm64: dts: Add support for NXP LS1028A SoC")
+Signed-off-by: Michael Walle <michael@walle.cc>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+index bd99fa68b763..5a2a188debd1 100644
+--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
++++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+@@ -151,8 +151,8 @@
+               ddr: memory-controller@1080000 {
+                       compatible = "fsl,qoriq-memory-controller";
+                       reg = <0x0 0x1080000 0x0 0x1000>;
+-                      interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
+-                      big-endian;
++                      interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
++                      little-endian;
+               };
+               dcfg: syscon@1e00000 {
+-- 
+2.30.2
+
diff --git a/queue-5.4/arm64-dts-zii-ultra-fix-12v_main-voltage.patch b/queue-5.4/arm64-dts-zii-ultra-fix-12v_main-voltage.patch
new file mode 100644 (file)
index 0000000..89b8d67
--- /dev/null
@@ -0,0 +1,38 @@
+From 8c6f671c2377aef9d1a7e0b2b07d0d67ebe1c605 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 7 May 2021 21:44:40 +0200
+Subject: arm64: dts: zii-ultra: fix 12V_MAIN voltage
+
+From: Lucas Stach <l.stach@pengutronix.de>
+
+[ Upstream commit ac0cbf9d13dccfd09bebc2f8f5697b6d3ffe27c4 ]
+
+As this is a fixed regulator on the board there was no harm in the wrong
+voltage being specified, apart from a confusing reporting to userspace.
+
+Fixes: 4a13b3bec3b4 ("arm64: dts: imx: add Zii Ultra board support")
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
+index 32ce14936b01..f385b143b308 100644
+--- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
+@@ -45,8 +45,8 @@
+       reg_12p0_main: regulator-12p0-main {
+               compatible = "regulator-fixed";
+               regulator-name = "12V_MAIN";
+-              regulator-min-microvolt = <5000000>;
+-              regulator-max-microvolt = <5000000>;
++              regulator-min-microvolt = <12000000>;
++              regulator-max-microvolt = <12000000>;
+               regulator-always-on;
+       };
+-- 
+2.30.2
+
diff --git a/queue-5.4/bus-ti-sysc-fix-flakey-idling-of-uarts-and-stop-usin.patch b/queue-5.4/bus-ti-sysc-fix-flakey-idling-of-uarts-and-stop-usin.patch
new file mode 100644 (file)
index 0000000..d07e59c
--- /dev/null
@@ -0,0 +1,58 @@
+From 81465a97a7ecb814cf669ab7fb637f90cec07840 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 25 May 2021 09:08:23 +0300
+Subject: bus: ti-sysc: Fix flakey idling of uarts and stop using
+ swsup_sidle_act
+
+From: Tony Lindgren <tony@atomide.com>
+
+[ Upstream commit c8692ad416dcc420ce1b403596a425c8f4c2720b ]
+
+Looks like the swsup_sidle_act quirk handling is unreliable for serial
+ports. The serial ports just eventually stop idling until woken up and
+re-idled again. As the serial port not idling blocks any deeper SoC idle
+states, it's adds an annoying random flakeyness for power management.
+
+Let's just switch to swsup_sidle quirk instead like we already do for
+omap3 uarts. This means we manually idle the port instead of trying to
+use the hardware autoidle features when not in use.
+
+For more details on why the serial ports have been using swsup_idle_act,
+see commit 66dde54e978a ("ARM: OMAP2+: hwmod-data: UART IP needs software
+control to manage sidle modes"). It seems that the swsup_idle_act quirk
+handling is not enough though, and for example the TI Android kernel
+changed to using swsup_sidle with commit 77c34c84e1e0 ("OMAP4: HWMOD:
+UART1: disable smart-idle.").
+
+Fixes: b4a9a7a38917 ("bus: ti-sysc: Handle swsup idle mode quirks")
+Cc: Carl Philipp Klemm <philipp@uvos.xyz>
+Cc: Ivan Jelincic <parazyd@dyne.org>
+Cc: Merlijn Wajer <merlijn@wizzup.org>
+Cc: Pavel Machek <pavel@ucw.cz>
+Cc: Sebastian Reichel <sre@kernel.org>
+Cc: Sicelo A. Mhlongo <absicsz@gmail.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/bus/ti-sysc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
+index d59e1ca9990b..90053c4a8290 100644
+--- a/drivers/bus/ti-sysc.c
++++ b/drivers/bus/ti-sysc.c
+@@ -1376,9 +1376,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
+                  SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
+       /* Uarts on omap4 and later */
+       SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x50411e03, 0xffff00ff,
+-                 SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
++                 SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
+       SYSC_QUIRK("uart", 0, 0x50, 0x54, 0x58, 0x47422e03, 0xffffffff,
+-                 SYSC_QUIRK_SWSUP_SIDLE_ACT | SYSC_QUIRK_LEGACY_IDLE),
++                 SYSC_QUIRK_SWSUP_SIDLE | SYSC_QUIRK_LEGACY_IDLE),
+       /* Quirks that need to be set based on the module address */
+       SYSC_QUIRK("mcpdm", 0x40132000, 0, 0x10, -ENODEV, 0x50000800, 0xffffffff,
+-- 
+2.30.2
+
index b076b0bed3d94df1d653cfd634dff9aa8d110ab6..9fe9c8d1af25b6276f4e3abb42ec43a7a54109ee 100644 (file)
@@ -27,3 +27,9 @@ ice-allow-all-lldp-packets-from-pf-to-tx.patch
 i2c-qcom-geni-add-shutdown-callback-for-i2c.patch
 i40e-optimize-for-xdp_redirect-in-xsk-path.patch
 i40e-add-correct-exception-tracing-for-xdp.patch
+arm64-dts-ls1028a-fix-memory-node.patch
+arm64-dts-zii-ultra-fix-12v_main-voltage.patch
+arm-dts-imx7d-meerkat96-fix-the-tuning-step-property.patch
+arm-dts-imx7d-pico-fix-the-tuning-step-property.patch
+arm-dts-imx-emcon-avari-fix-nxp-pca8574-gpio-cells.patch
+bus-ti-sysc-fix-flakey-idling-of-uarts-and-stop-usin.patch