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 <nickey.yang@rock-chips.com>
This commit is contained in:
Nickey Yang 2017-03-03 15:45:53 +08:00 committed by Huang, Tao
parent d5eab5f17b
commit fff8ad7caa
9 changed files with 2 additions and 45 deletions

View File

@ -336,7 +336,6 @@ &hdmi {
#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 @@ rt5640: rt5640@1c {
};
};
&i2c5 {
status = "okay";
};
&i2s {
#sound-dai-cells = <0>;
status = "okay";

View File

@ -214,7 +214,6 @@ &hdmi {
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <0>;
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -426,10 +425,6 @@ es8323: es8323@10 {
};
};
&i2c5 {
status = "okay";
};
&i2s {
#sound-dai-cells = <0>;
status = "okay";

View File

@ -277,7 +277,6 @@ &gpu {
};
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -440,10 +439,6 @@ &i2c4 {
status = "okay";
};
&i2c5 {
status = "okay";
};
&io_domains {
status = "okay";

View File

@ -158,8 +158,6 @@ &hdmi {
#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 @@ &i2c2 {
status = "okay";
};
&i2c5 {
status = "okay";
};
&i2s {
#sound-dai-cells = <0>;
status = "okay";

View File

@ -202,7 +202,6 @@ &hdmi {
#address-cells = <1>;
#size-cells = <0>;
#sound-dai-cells = <0>;
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -412,10 +411,6 @@ &i2c2 {
/* Add more nodes to your requirement, such as i2c2 */
};
&i2c5 {
status = "okay";
};
&i2s {
#sound-dai-cells = <0>;
status = "okay";

View File

@ -195,7 +195,6 @@ &gpu {
};
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -430,10 +429,6 @@ &i2c4 {
status = "okay";
};
&i2c5 {
status = "okay";
};
&io_domains {
status = "okay";

View File

@ -107,7 +107,6 @@ &gmac {
};
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -126,10 +125,6 @@ hym8563@51 {
};
};
&i2c5 {
status = "okay";
};
&pinctrl {
pmic {
pmic_int: pmic-int {

View File

@ -146,7 +146,6 @@ &emmc {
};
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
};
@ -318,14 +317,6 @@ &i2c4 {
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";

View File

@ -1335,6 +1335,8 @@ hdmi: hdmi@ff980000 {
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
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";