From: Greg Kroah-Hartman Date: Fri, 13 Sep 2024 12:42:59 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v6.1.111~46 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2fe6d956ff2becdbc2e24b50e495183a06944dc;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: arm64-dts-rockchip-override-bios_disable-signal-via-gpio-hog-on-rk3399-puma.patch --- diff --git a/queue-4.19/arm64-dts-rockchip-override-bios_disable-signal-via-gpio-hog-on-rk3399-puma.patch b/queue-4.19/arm64-dts-rockchip-override-bios_disable-signal-via-gpio-hog-on-rk3399-puma.patch new file mode 100644 index 00000000000..cff734f985a --- /dev/null +++ b/queue-4.19/arm64-dts-rockchip-override-bios_disable-signal-via-gpio-hog-on-rk3399-puma.patch @@ -0,0 +1,70 @@ +From 741f5ba7ccba5d7ae796dd11c320e28045524771 Mon Sep 17 00:00:00 2001 +From: Quentin Schulz +Date: Wed, 31 Jul 2024 13:05:29 +0200 +Subject: arm64: dts: rockchip: override BIOS_DISABLE signal via GPIO hog on RK3399 Puma + +From: Quentin Schulz + +commit 741f5ba7ccba5d7ae796dd11c320e28045524771 upstream. + +The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module eMMC +and SPI flash powered-down initially (in fact it keeps the reset signal +asserted). BIOS_DISABLE_OVERRIDE pin allows to override that signal so +that eMMC and SPI can be used regardless of the state of the signal. + +Let's make this GPIO a hog so that it's reserved and locked in the +proper state. + +At the same time, make sure the pin is reserved for the hog and cannot +be requested by another node. + +Cc: stable@vger.kernel.org +Signed-off-by: Quentin Schulz +Link: https://lore.kernel.org/r/20240731-puma-emmc-6-v1-2-4e28eadf32d0@cherry.de +Signed-off-by: Heiko Stuebner +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +@@ -147,6 +147,22 @@ + status = "okay"; + }; + ++&gpio3 { ++ /* ++ * The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module ++ * eMMC and SPI flash powered-down initially (in fact it keeps the ++ * reset signal asserted). BIOS_DISABLE_OVERRIDE pin allows to override ++ * that signal so that eMMC and SPI can be used regardless of the state ++ * of the signal. ++ */ ++ bios-disable-override-hog { ++ gpios = ; ++ gpio-hog; ++ line-name = "bios_disable_override"; ++ output-high; ++ }; ++}; ++ + &gmac { + assigned-clocks = <&cru SCLK_RMII_SRC>; + assigned-clock-parents = <&clkin_gmac>; +@@ -433,9 +449,14 @@ + + &pinctrl { + pinctrl-names = "default"; +- pinctrl-0 = <&q7_thermal_pin>; ++ pinctrl-0 = <&q7_thermal_pin &bios_disable_override_hog_pin>; + + gpios { ++ bios_disable_override_hog_pin: bios-disable-override-hog-pin { ++ rockchip,pins = ++ <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ + q7_thermal_pin: q7-thermal-pin { + rockchip,pins = + <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; diff --git a/queue-4.19/series b/queue-4.19/series index 2763e5e9263..900b0a525ab 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -5,3 +5,4 @@ usbnet-ipheth-fix-carrier-detection-in-modes-1-and-4.patch net-ethernet-use-ip_hdrlen-instead-of-bit-shift.patch net-phy-vitesse-repair-vsc73xx-autonegotiation.patch scripts-kconfig-merge_config-config-files-add-a-trai.patch +arm64-dts-rockchip-override-bios_disable-signal-via-gpio-hog-on-rk3399-puma.patch