summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>2024-03-08 16:46:08 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-05-02 16:17:11 +0200
commit8ada42c66029ee8ec7918b2a5bb2feb9dbe461f1 (patch)
tree8b8f42be7f69c5438de6807d55e2e0c4008f4bd3
parente0fbabb4865a9f2eebfa8688765fd6fd76185bba (diff)
downloadlinux-stable-8ada42c66029ee8ec7918b2a5bb2feb9dbe461f1.tar.gz
linux-stable-8ada42c66029ee8ec7918b2a5bb2feb9dbe461f1.tar.bz2
linux-stable-8ada42c66029ee8ec7918b2a5bb2feb9dbe461f1.zip
arm64: dts: rockchip: enable internal pull-up on PCIE_WAKE# for RK3399 Puma
[ Upstream commit 945a7c8570916650a415757d15d83e0fa856a686 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-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 b79017c41ce5..1c9b4a955708 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -426,6 +426,11 @@
gpio1830-supply = <&vcc_1v8>;
};
+&pcie_clkreqn_cpm {
+ rockchip,pins =
+ <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
+};
+
&pinctrl {
i2c8 {
i2c8_xfer_a: i2c8-xfer {