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>

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index d8a64fd1c1f214f1e9139ec74471fe838a301959..e7058923a7d26e24f45c3dc6f62e79a36f4fa73e 100644 (file)
--- 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>;
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 
        /* Don't use vopl for HDMI */
        status = "okay";
 
        /* Don't use vopl for HDMI */


@@ -420,10 +419,6 @@
        };
 };
 
        };
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &i2s {
        #sound-dai-cells = <0>;
        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 f05ef49d8922e0bb5c05b7b1164ceab1ca7d174f..6ff2a957387015ea8959a2f0ed59ea196e7b53a1 100644 (file)
--- 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>;
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -426,10 +425,6 @@
        };
 };
 
        };
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &i2s {
        #sound-dai-cells = <0>;
        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 e38b64152e558e188d9816f9a1f06cb459fb5205..63877044437c2a3fc6d0459abc3faf0d290a74b1 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -277,7 +277,6 @@
 };
 
 &hdmi {
 };
 
 &hdmi {

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -440,10 +439,6 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &io_domains {
        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 6b0f9a096c0b2e428e2584d5b5407065a39d6d17..eee3820747d68bcb1fbf3a33e97b16d8f42bc33e 100644 (file)
--- 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>;
        #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 {
        status = "okay";
        /* Don't use vopl for HDMI */
        ports {


@@ -372,10 +370,6 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &i2s {
        #sound-dai-cells = <0>;
        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 6de26c855e5c3bdc6e9534d982bf18d6f359b149..b67d874893ad271a2dfd1dc45ed51d5dfee8b6a8 100644 (file)
--- 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>;
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -412,10 +411,6 @@ I2C
        /* Add more nodes to your requirement, such as i2c2 */
 };
 
        /* Add more nodes to your requirement, such as i2c2 */
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &i2s {
        #sound-dai-cells = <0>;
        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 57262538827ac61936ddcb35f16c12398d98fef3..6089a827238828f313e41818bb0361547ad3cfe7 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -195,7 +195,6 @@
 };
 
 &hdmi {
 };
 
 &hdmi {

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -430,10 +429,6 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &io_domains {
        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 8af35c867a8013e78b278bb6b855e2dc43d62e60..eee4cb4b6e818a748a0b5c404916081f551a8368 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-square.dts
+++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -107,7 +107,6 @@
 };
 
 &hdmi {
 };
 
 &hdmi {

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -126,10 +125,6 @@
        };
 };
 
        };
 };
 

-&i2c5 {
-       status = "okay";
-};
-

 &pinctrl {
        pmic {
                pmic_int: pmic-int {
 &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 4c1f921d9c8c616c6b7a66796276c1ae1bd5f4a3..a48dffd2c54032ced7d67c822cec6c462d6b4449 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -146,7 +146,6 @@
 };
 
 &hdmi {
 };
 
 &hdmi {

-       ddc-i2c-bus = <&i2c5>;

        status = "okay";
 };
 
        status = "okay";
 };
 


@@ -318,14 +317,6 @@
        i2c-scl-rising-time-ns = <300>;         /* 225ns measured */
 };
 
        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";
 
 &io_domains {
        status = "okay";
 

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 52b21ec66fd956e5a8abd641421c3381dfbd1bed..dea53e714f096f41658c6cfd560a880379c74f50 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1335,6 +1335,8 @@
                interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
                clock-names = "iahb", "isfr";
                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";
 
                power-domains = <&power RK3288_PD_VIO>;
                status = "disabled";