diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-29 13:45:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-29 13:45:06 +0200 |
| commit | c0201754ccdf82719cd1f414871870f083b1a1f7 (patch) | |
| tree | 419844faec4066fbeda37e8e3a93539c94d0ece4 | |
| parent | 2b031d9173763fb3afc7975bf2ed7f4f1760100f (diff) | |
| download | stable-queue-c0201754ccdf82719cd1f414871870f083b1a1f7.tar.gz | |
4.19-stable patches
added patches:
arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch
| -rw-r--r-- | queue-4.19/arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch | 45 | ||||
| -rw-r--r-- | queue-4.19/series | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/queue-4.19/arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch b/queue-4.19/arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch new file mode 100644 index 0000000000..7ebfd6cd19 --- /dev/null +++ b/queue-4.19/arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch @@ -0,0 +1,45 @@ +From 0ac417b8f124427c90ec8c2ef4f632b821d924cc Mon Sep 17 00:00:00 2001 +From: Iskander Amara <iskander.amara@theobroma-systems.com> +Date: Fri, 8 Mar 2024 09:52:42 +0100 +Subject: arm64: dts: rockchip: enable internal pull-up for Q7_THRM# on RK3399 Puma + +From: Iskander Amara <iskander.amara@theobroma-systems.com> + +commit 0ac417b8f124427c90ec8c2ef4f632b821d924cc upstream. + +Q7_THRM# pin is connected to a diode on the module which is used +as a level shifter, and the pin have a pull-down enabled by +default. We need to configure it to internal pull-up, other- +wise whenever the pin is configured as INPUT and we try to +control it externally the value will always remain zero. + +Signed-off-by: Iskander Amara <iskander.amara@theobroma-systems.com> +Fixes: 2c66fc34e945 ("arm64: dts: rockchip: add RK3399-Q7 (Puma) SoM") +Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20240308085243.69903-1-iskander.amara@theobroma-systems.com +Signed-off-by: Heiko Stuebner <heiko@sntech.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +@@ -432,6 +432,16 @@ + }; + + &pinctrl { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&q7_thermal_pin>; ++ ++ gpios { ++ q7_thermal_pin: q7-thermal-pin { ++ rockchip,pins = ++ <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ + i2c8 { + i2c8_xfer_a: i2c8-xfer { + rockchip,pins = diff --git a/queue-4.19/series b/queue-4.19/series index 8a63795e9f..20a2e6d1e0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -60,3 +60,4 @@ tracing-show-size-of-requested-perf-buffer.patch tracing-increase-perf_max_trace_size-to-handle-sentinel1-and-docker-together.patch bluetooth-fix-type-of-len-in-l2cap-sco-_sock_getsockopt_old.patch btrfs-fix-information-leak-in-btrfs_ioctl_logical_to_ino.patch +arm64-dts-rockchip-enable-internal-pull-up-for-q7_thrm-on-rk3399-puma.patch |