From fff8ad7caa30ace1a3ec3eeb21413e0e5fd8df31 Mon Sep 17 00:00:00 2001 From: Nickey Yang Date: Fri, 3 Mar 2017 15:45:53 +0800 Subject: [PATCH] ARM: dts: rockchip: use hdmi-ddc for ddc bus in rk3288 Using the builtin I2C controller in dw_hdmi is better than using the normal RK3288 I2C controller(I2C5). Test: work normally when switch mode between 4K@60hz|4K@30hz|1080P.. Change-Id: Ifb4b72ca5649efb0cc3055f2db34ebbcc2377c4c Signed-off-by: Nickey Yang --- arch/arm/boot/dts/rk3288-evb.dtsi | 5 ----- arch/arm/boot/dts/rk3288-fennec.dts | 5 ----- arch/arm/boot/dts/rk3288-firefly.dtsi | 5 ----- arch/arm/boot/dts/rk3288-miniarm.dts | 6 ------ arch/arm/boot/dts/rk3288-miqi.dts | 5 ----- arch/arm/boot/dts/rk3288-popmetal.dts | 5 ----- arch/arm/boot/dts/rk3288-rock2-square.dts | 5 ----- arch/arm/boot/dts/rk3288-veyron.dtsi | 9 --------- arch/arm/boot/dts/rk3288.dtsi | 2 ++ 9 files changed, 2 insertions(+), 45 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi index d8a64fd1c1f2..e7058923a7d2 100644 --- a/arch/arm/boot/dts/rk3288-evb.dtsi +++ b/arch/arm/boot/dts/rk3288-evb.dtsi @@ -336,7 +336,6 @@ #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>; - ddc-i2c-bus = <&i2c5>; status = "okay"; /* Don't use vopl for HDMI */ @@ -420,10 +419,6 @@ }; }; -&i2c5 { - status = "okay"; -}; - &i2s { #sound-dai-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts index f05ef49d8922..6ff2a9573870 100644 --- a/arch/arm/boot/dts/rk3288-fennec.dts +++ b/arch/arm/boot/dts/rk3288-fennec.dts @@ -214,7 +214,6 @@ #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>; - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -426,10 +425,6 @@ }; }; -&i2c5 { - status = "okay"; -}; - &i2s { #sound-dai-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index e38b64152e55..63877044437c 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi @@ -277,7 +277,6 @@ }; &hdmi { - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -440,10 +439,6 @@ status = "okay"; }; -&i2c5 { - status = "okay"; -}; - &io_domains { status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index 6b0f9a096c0b..eee3820747d6 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -158,8 +158,6 @@ #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&hdmi_ddc>; status = "okay"; /* Don't use vopl for HDMI */ ports { @@ -372,10 +370,6 @@ status = "okay"; }; -&i2c5 { - status = "okay"; -}; - &i2s { #sound-dai-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts index 6de26c855e5c..b67d874893ad 100644 --- a/arch/arm/boot/dts/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rk3288-miqi.dts @@ -202,7 +202,6 @@ #address-cells = <1>; #size-cells = <0>; #sound-dai-cells = <0>; - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -412,10 +411,6 @@ I2C /* Add more nodes to your requirement, such as i2c2 */ }; -&i2c5 { - status = "okay"; -}; - &i2s { #sound-dai-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts index 57262538827a..6089a8272388 100644 --- a/arch/arm/boot/dts/rk3288-popmetal.dts +++ b/arch/arm/boot/dts/rk3288-popmetal.dts @@ -195,7 +195,6 @@ }; &hdmi { - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -430,10 +429,6 @@ status = "okay"; }; -&i2c5 { - status = "okay"; -}; - &io_domains { status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts index 8af35c867a80..eee4cb4b6e81 100644 --- a/arch/arm/boot/dts/rk3288-rock2-square.dts +++ b/arch/arm/boot/dts/rk3288-rock2-square.dts @@ -107,7 +107,6 @@ }; &hdmi { - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -126,10 +125,6 @@ }; }; -&i2c5 { - status = "okay"; -}; - &pinctrl { pmic { pmic_int: pmic-int { diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 4c1f921d9c8c..a48dffd2c540 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -146,7 +146,6 @@ }; &hdmi { - ddc-i2c-bus = <&i2c5>; status = "okay"; }; @@ -318,14 +317,6 @@ i2c-scl-rising-time-ns = <300>; /* 225ns measured */ }; -&i2c5 { - status = "okay"; - - clock-frequency = <100000>; - i2c-scl-falling-time-ns = <300>; - i2c-scl-rising-time-ns = <1000>; -}; - &io_domains { status = "okay"; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 52b21ec66fd9..dea53e714f09 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -1335,6 +1335,8 @@ interrupts = ; clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>; clock-names = "iahb", "isfr"; + pinctrl-names = "default"; + pinctrl-0 = <&hdmi_ddc>; power-domains = <&power RK3288_PD_VIO>; status = "disabled"; -- 2.34.1