From: Joachim Eastwood <[email protected]> On-chip DDC controller is unreliable on this board so override DDC on the HDMI connector with i2c-gpio. The root cause of breakage is not known but on-chip DDC controller refuses to read the EDID.
Signed-off-by: Joachim Eastwood <[email protected]> --- .../arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts index 3811f9a73bb6c..da6282c105255 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts @@ -37,6 +37,7 @@ chosen { hdmi0-con { compatible = "hdmi-connector"; + ddc-i2c-bus = <&i2c_gpio_ddc>; type = "a"; port { @@ -46,6 +47,16 @@ hdmi0_con_in: endpoint { }; }; + /* on-chip DDC controller is unreliable on this board */ + i2c_gpio_ddc: i2c-ddc { + compatible = "i2c-gpio"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c_ddc_scl &i2c_ddc_sda>; + scl-gpios = <&gpio4 RK_PB7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpio4 RK_PC0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + i2c-gpio,delay-us = <5>; + }; + ir-receiver { compatible = "gpio-ir-receiver"; gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>; @@ -211,8 +222,7 @@ &gpu { &hdmi0 { frl-enable-gpios = <&gpio4 RK_PB1 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd - &hdmim0_tx0_scl &hdmim0_tx0_sda &hdmi0_tx_on_h>; + pinctrl-0 = <&hdmim0_tx0_cec &hdmim0_tx0_hpd &hdmi0_tx_on_h>; pinctrl-names = "default"; status = "okay"; }; @@ -347,6 +357,14 @@ hdmi { hdmi0_tx_on_h: hdmi0-tx-on-h { rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; }; + + i2c_ddc_scl: i2c-ddc-scl { + rockchip,pins = <4 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + i2c_ddc_sda: i2c-ddc-sda { + rockchip,pins = <4 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; hym8563 { -- 2.56.0
