1cd8ae19a9
Add backported patched from 5.x from usb related fixes Up kernel version to most recent lts
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From c077d9d717dc481a6a95f9ef2562ef6bda74fbdf Mon Sep 17 00:00:00 2001
|
|
From: Douglas Anderson <dianders@chromium.org>
|
|
Date: Thu, 2 May 2019 15:53:35 -0700
|
|
Subject: [PATCH 46/54] ARM: dts: rockchip: Add unwedge pinctrl entries for
|
|
dw_hdmi on rk3288
|
|
|
|
This adds the "unwedge" pinctrl entries introduced by a recent dw_hdmi
|
|
change that can unwedge the dw_hdmi i2c bus in some cases. It's
|
|
expected that any boards using this would add:
|
|
|
|
pinctrl-names = "default", "unwedge";
|
|
pinctrl-0 = <&hdmi_ddc>;
|
|
pinctrl-1 = <&hdmi_ddc_unwedge>;
|
|
|
|
Note that this isn't added by default because some boards may choose
|
|
to mux i2c5 for their DDC bus (if that is more tested for them).
|
|
|
|
Signed-off-by: Douglas Anderson <dianders@chromium.org>
|
|
Reviewed-by: Sean Paul <sean@poorly.run>
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm/boot/dts/rk3288.dtsi | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
|
index 766d1cf51a5b..cc893e154fe5 100644
|
|
--- a/arch/arm/boot/dts/rk3288.dtsi
|
|
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
|
@@ -1547,6 +1547,15 @@
|
|
rockchip,pins = <7 RK_PC3 2 &pcfg_pull_none>,
|
|
<7 RK_PC4 2 &pcfg_pull_none>;
|
|
};
|
|
+
|
|
+ hdmi_ddc_unwedge: hdmi-ddc-unwedge {
|
|
+ rockchip,pins = <7 RK_PC3 RK_FUNC_GPIO &pcfg_output_low>,
|
|
+ <7 RK_PC4 2 &pcfg_pull_none>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ pcfg_output_low: pcfg-output-low {
|
|
+ output-low;
|
|
};
|
|
|
|
pcfg_pull_up: pcfg-pull-up {
|
|
--
|
|
2.11.0
|
|
|