arm64: dts: imx8mp-verdin: add device tree for dahlia

Only the Development Board gives access to the native hdmi signals.
Move the nodes into imx8mp-verdin-dev.dtsi.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
        arch/arm64/boot/dts/freescale/Makefile
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

1 files changed, 2 insertions, 67 deletions

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
index 03ef85a8f3b0..07b851aeec80 100755
--- a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
@@ -126,9 +126,8 @@
 			"Headphone Jack", "HPOUTR",
 			"IN2L", "Line In Jack",
 			"IN2R", "Line In Jack",
-			"Microphone Jack", "MICBIAS",
-			"IN1L", "Microphone Jack",
-			"IN1R", "Microphone Jack";
+			"Headphone Jack", "MICBIAS",
+			"IN1L", "Headphone Jack";
 		simple-audio-card,widgets =
 			"Microphone", "Microphone Jack",
 			"Headphone", "Headphone Jack",
@@ -143,31 +142,12 @@
 			sound-dai = <&sai1>;
 		};
 	};
-
-	sound-hdmi {
-		compatible = "fsl,imx-audio-cdnhdmi";
-		model = "audio-hdmi";
-		audio-cpu = <&aud2htx>;
-		hdmi-out;
-		constraint-rate = <44100>,
-				<88200>,
-				<176400>,
-				<32000>,
-				<48000>,
-				<96000>,
-				<192000>;
-		status = "okay";
-	};
 };
 
 &A53_0 {
 	cpu-supply = <&buck2_reg>;
 };
 
-&aud2htx {
-	status = "okay";
-};
-
 /* compare with commit d0307f1e31c64 */
 &clk {
 	init-on-array = <IMX8MP_CLK_HSIO_ROOT>;
@@ -280,34 +260,6 @@
 	gpio-line-names = "";
 };
 
-&gpu_2d {
-	status = "okay";
-};
-
-&gpu_3d {
-	status = "okay";
-};
-
-&hdmi {
-	status = "okay";
-};
-
-&hdmimix_clk {
-	status = "okay";
-};
-
-&hdmimix_reset {
-	status = "okay";
-};
-
-&hdmiphy {
-	status = "okay";
-};
-
-&hdmi_pavi {
-	status = "okay";
-};
-
 /* On-module I2C */
 &i2c1 {
 	clock-frequency = <400000>;
@@ -570,23 +522,6 @@
 	};
 };
 
-&irqsteer_hdmi {
-	status = "okay";
-};
-
-/* LCDIF to on-SoC Samsung HDMI PHY */
-&lcdif3 {
-	status = "okay";
-};
-
-&mix_gpu_ml {
-	status = "okay";
-};
-
-&ml_vipsi {
-	status = "okay";
-};
-
 &mu {
 	status = "okay";
 };