ARM: dts: apalis-imx6: rework and disable hdmi_tx_ddc

Now HDMI interface is driven with an overlay, so that it is not needed to
configure hdmi_ddc on a board level.

Move all i2cddc/hdmi_ddc stuff to the module level and disable it by
default.

Related-to: ELB-3240
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

5 files changed, 11 insertions, 51 deletions

diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 2adc9d2c10d6..dae97fe97deb 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -226,19 +226,6 @@
 	};
 };
 
-/*
- * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207
- */
-&i2cddc {
-	status = "okay";
-
-	hdmi_ddc: edid@50 {
-		compatible = "fsl,imx6-hdmi-i2c";
-		reg = <0x50>;
-		status = "disabled";
-	};
-};
-
 &mipi_csi {
 	ipu_id = <0>;
 	csi_id = <1>;
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index 962a9e492657..dcc35ee4f35a 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -272,18 +272,6 @@
 	};
 };
 
-/*
- * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207
- */
-&i2cddc {
-	status = "okay";
-
-	hdmi_ddc: edid@50 {
-		compatible = "fsl,imx6-hdmi-i2c";
-		reg = <0x50>;
-	};
-};
-
 &ipu1_di1_disp1 {
 	remote-endpoint = <&lcd_display_in>;
 };
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
index 975bd6198b11..bbdd539d7d8d 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
@@ -295,18 +295,6 @@
 	};
 };
 
-/*
- * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207
- */
-&i2cddc {
-	status = "okay";
-
-	hdmi_ddc: edid@50 {
-		compatible = "fsl,imx6-hdmi-i2c";
-		reg = <0x50>;
-	};
-};
-
 &mipi_csi {
 	ipu_id = <0>;
 	csi_id = <1>;
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 1f1298f3a0cc..9afb9d5dd063 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -249,18 +249,6 @@
 	};
 };
 
-/*
- * DDC_I2C: I2C2_SDA/SCL on MXM3 205/207
- */
-&i2cddc {
-	status = "okay";
-
-	hdmi_ddc: edid@50 {
-		compatible = "fsl,imx6-hdmi-i2c";
-		reg = <0x50>;
-	};
-};
-
 &ipu1_di1_disp1 {
 	remote-endpoint = <&lcd_display_in>;
 };
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 32171a3e7bbe..2ba8319ca3b7 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -71,18 +71,27 @@
 		status = "disabled";
 	};
 
-	/* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
+	/*
+	 * HDMI_TX_DDC: I2C2_DDC_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|GPIO_OPEN_DRAIN) /* sda */
+		gpios = <
+			 &gpio3 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* sda */
 			 &gpio2 30 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* scl */
 			>;
 		i2c-gpio,delay-us = <2>;	/* ~100 kHz */
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
+
+		hdmi_ddc: edid@50 {
+			compatible = "fsl,imx6-hdmi-i2c";
+			reg = <0x50>;
+			status = "disabled";
+		};
 	};
 
 	lcd: lcd@0 {