ARM: dts: rockchip: use hdmi-ddc for ddc bus in rk3288
authorNickey Yang <nickey.yang@rock-chips.com>
Fri, 3 Mar 2017 07:45:53 +0000 (15:45 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Thu, 9 Mar 2017 07:00:25 +0000 (15:00 +0800)
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>
arch/arm/boot/dts/rk3288-evb.dtsi
arch/arm/boot/dts/rk3288-fennec.dts
arch/arm/boot/dts/rk3288-firefly.dtsi
arch/arm/boot/dts/rk3288-miniarm.dts
arch/arm/boot/dts/rk3288-miqi.dts
arch/arm/boot/dts/rk3288-popmetal.dts
arch/arm/boot/dts/rk3288-rock2-square.dts
arch/arm/boot/dts/rk3288-veyron.dtsi
arch/arm/boot/dts/rk3288.dtsi

index d8a64fd..e705892 100644 (file)
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 
        /* Don't use vopl for HDMI */
        };
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &i2s {
        #sound-dai-cells = <0>;
        status = "okay";
index f05ef49..6ff2a95 100644 (file)
        #address-cells = <1>;
        #size-cells = <0>;
        #sound-dai-cells = <0>;
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
        };
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &i2s {
        #sound-dai-cells = <0>;
        status = "okay";
index e38b641..6387704 100644 (file)
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
        status = "okay";
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &io_domains {
        status = "okay";
 
index 6b0f9a0..eee3820 100644 (file)
        #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";
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &i2s {
        #sound-dai-cells = <0>;
        status = "okay";
index 6de26c8..b67d874 100644 (file)
        #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";
index 5726253..6089a82 100644 (file)
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
        status = "okay";
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &io_domains {
        status = "okay";
 
index 8af35c8..eee4cb4 100644 (file)
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
        };
 };
 
-&i2c5 {
-       status = "okay";
-};
-
 &pinctrl {
        pmic {
                pmic_int: pmic-int {
index 4c1f921..a48dffd 100644 (file)
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2c5>;
        status = "okay";
 };
 
        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";
 
index 52b21ec..dea53e7 100644 (file)
                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";