summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>2024-03-08 16:46:08 +0100
committerQuentin Schulz <quentin.schulz@theobroma-systems.com>2024-03-25 11:39:38 +0100
commit9b4da7b90b6e4bfa7a2ab9433c396d920eb8bd6c (patch)
treeab0c1c4bab2abdad57f7d68459bb045ab5f0f904
parent4a3fb70943a448496f0eab3366d91c6ab60a6565 (diff)
UPSTREAM: arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma
The PCIE_WAKE# has a diode used as a level-shifter, and is used as an input pin. While the SoC default is to enable the pull-up, the core rk3399 pinconf for this pin opted for pull-none. So as to not disturb the behaviour of other boards which may rely on pull-none instead of pull-up, set the needed pull-up only for RK3399 Puma. Fixes: 60fd9f72ce8a ("arm64: dts: rockchip: add Haikou baseboard with RK3399-Q7 SoM") Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Link: https://lore.kernel.org/r/20240308-puma-diode-pu-v2-2-309f83da110a@theobroma-systems.com Signed-off-by: Heiko Stuebner <heiko@sntech.de> (cherry picked from commit 945a7c8570916650a415757d15d83e0fa856a686) Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index 0fa375915829..c1aecebadb5a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -415,6 +415,11 @@
gpio1830-supply = <&vcc_1v8>;
};
+&pcie_clkreqn_cpm {
+ rockchip,pins =
+ <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
+};
+
&pinctrl {
pinctrl-names = "default";
pinctrl-0 = <&q7_thermal_pin>;