summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2015-09-02 14:54:22 -0700
committerHeiko Stuebner <heiko@sntech.de>2015-10-08 22:37:42 +0200
commite61ccb12d3b78c229c07e8b3e9008f1ce6dd1b74 (patch)
treea7e9e0cecca5efa2918b7794e213e802b54fffd3 /arch/arm
parent035015b10e7545bb503413999070e99ccd32c1d2 (diff)
ARM: dts: rockchip: Add the hdmi-ddc pinctrl settings for rk3288
The pins for i2c5 can either be configured as "I2C5" which means that they're controlled by the normal RK3288 I2C controller or as "EDP / HDMI I2C". It's unclear why EDP is referenced here since apparently setting the mux to this position enables I2C communication using the dw_hdmi block with a patch like <https://patchwork.kernel.org/patch/7098101/>. There appear to be some reasons why using the builtin I2C controller in dw_hdmi is better than using the normal RK3288 I2C controller, so boards based on rk3288 might eventually want to use this pinmux if it's known to work. Once driver support in dw_hdmi lands, boards would use this by selecting this pinctrl for the HDMI block and then _not_ specifying a ddc-i2c-bus and _not_ setting the status to "okay" for i2c5 (which uses the same pins). Signed-off-by: Douglas Anderson <dianders@chromium.org> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/rk3288.dtsi7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 0e8fd5353724..a12e654504bc 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -923,6 +923,13 @@
#interrupt-cells = <2>;
};
+ hdmi {
+ hdmi_ddc: hdmi-ddc {
+ rockchip,pins = <7 19 RK_FUNC_2 &pcfg_pull_none>,
+ <7 20 RK_FUNC_2 &pcfg_pull_none>;
+ };
+ };
+
pcfg_pull_up: pcfg-pull-up {
bias-pull-up;
};