ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi

Migrate to using functionally-reduced I2C master contained in the DWC
HDMI. Therefore drop the GPIO bitbanging based i2cddc definition and
modify resp. pinctrl.

While at it re-order the I2C aliases to start with the generic, followed
by the camera and concluded by the power I2C one.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 73c1ec883ff57540cf914495b09d2f7ff60c24bc..60d33e99de76037cf546c8000ade4304c959c1c6 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -55,10 +55,9 @@ / {
                     "fsl,imx6q";
 
        aliases {
-               i2c0 = &i2cddc;
-               i2c1 = &i2c1;
+               i2c0 = &i2c1;
+               i2c1 = &i2c3;
                i2c2 = &i2c2;
-               i2c3 = &i2c3;
                rtc0 = &rtc_i2c;
                rtc1 = &snvs_rtc;
        };
@@ -161,11 +160,6 @@ &can2 {
 };
 
 &hdmi {
-       ddc-i2c-bus = <&i2cddc>;
-       status = "okay";
-};
-
-&i2cddc {
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 6658c659b7d7e77bf177a2cfd14cbc93b5dd9009..ea339fa58f4a5a99f1834778e926ce022f139cdd 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -56,18 +56,6 @@ backlight: backlight {
                status = "disabled";
        };
 
-       /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
-       i2cddc: i2c@0 {
-               compatible = "i2c-gpio";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_i2c_ddc>;
-               gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
-                        &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
-                       >;
-               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
-               status = "disabled";
-       };
-
        reg_1p8v: regulator-1p8v {
                compatible = "regulator-fixed";
                regulator-name = "1P8V";
@@ -210,6 +198,12 @@ ethphy: ethernet-phy@7 {
        };
 };
 
+&hdmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hdmi_ddc>;
+       status = "disabled";
+};
+
 /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
 &i2c1 {
        clock-frequency = <100000>;
@@ -638,11 +632,10 @@ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
                >;
        };
 
-       pinctrl_i2c_ddc: gpioi2cddcgrp {
+       pinctrl_hdmi_ddc: hdmiddcgrp {
                fsl,pins = <
-                       /* DDC bitbang */
-                       MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x1b0b0
-                       MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x1b0b0
+                       MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1
+                       MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1
                >;
        };