From 2a8ce270ad7f161a2c6473985c78118c8a5d8738 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Sun, 11 Feb 2018 11:27:50 +0800 Subject: [PATCH] arm64: dts: rockchip: remove the hdmi-cec pinctrl for rk3399 excavator As the edp_hpd pinctrl is reused by hdmi-cec. So the rk3399 will hit the pinctrl register failed on bootup. Says: the failed log: [0.927577] rockchip-pinctrl pinctrl: pin gpio4-23 already requested by ff940000.hdmi; cannot claim for ff970000.edp [0.928519 ] rockchip-pinctrl pinctrl: pin-151 (ff970000.edp) status -22 [0.929112] rockchip-pinctrl pinctrl: could not request pin 151 (gpio4-23) from group edp-hpd on device rockchip-pinctr That will cause the edp can't work on rk3399 SoCs. Fixes: commit 6e4eaff822fc ("arm64: dts: rockchip: add HDMI cec support for rk3399") Change-Id: I8ba20db55025e33c082beda5160e0398f1681766 Signed-off-by: Caesar Wang --- .../arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts index 7ba30e807913..dc549b2bf67d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -218,6 +218,8 @@ }; &hdmi { + /* remove the hdmi_cec, reused by edp_hpd */ + pinctrl-0 = <&hdmi_i2c_xfer>; #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>;