ARM: dts: apalis-imx6: rework and disable vga interface

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

Move all VGA-related stuff to the module level and disable it by
default.

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

2 files changed, 19 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index eb9f1eded4e7..fe952c1cb1a6 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -131,16 +131,6 @@
 		regulator-max-microvolt = <3300000>;
 		regulator-always-on;
 	};
-
-	vga {
-		compatible = "vga-connector";
-
-		port {
-			vga_con_in: endpoint {
-				remote-endpoint = <&vga_bridge_out>;
-			};
-		};
-	};
 };
 
 &can1 {
@@ -314,22 +304,3 @@
 	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
-
-&vgabridge {
-	status = "okay";
-
-	ports {
-		port@1 {
-			reg = <1>;
-
-			vga_bridge_out: endpoint {
-				remote-endpoint = <&vga_con_in>;
-			};
-		};
-	};
-};
-
-&vgadisplay {
-	status = "okay";
-};
-
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 8db059049092..d81f49cbd6b4 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -191,10 +191,19 @@
 		status = "disabled";
 	};
 
+	vgaconnector: vga {
+		compatible = "vga-connector";
+		status = "disabled";
+
+		port {
+			vga_con_in: endpoint {
+				remote-endpoint = <&vga_bridge_out>;
+			};
+		};
+	};
+
 	vgabridge: bridge {
 		compatible = "dumb-vga-dac";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		de-active = <0>;
 		status = "disabled";
 
@@ -209,6 +218,14 @@
 					remote-endpoint = <&vga_display_out>;
 				};
 			};
+
+			port@1 {
+				reg = <1>;
+
+				vga_bridge_out: endpoint {
+					remote-endpoint = <&vga_con_in>;
+				};
+			};
 		};
 	};