arm64:dts:tr8p: Combine audio nodes, drop support for: 'PCB_REVISION<2'

arch/arm64/boot/dts/seconorth/trizeps8plus.dtsi

@@ -205,77 +205,40 @@ reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
 		vin-supply = <&reg_vin_fused>;
 	};
 
-#if defined(TRIZEPS8MINI_BT_SCO_XTOR) && (TRIZEPS8MINI_BT_SCO_XTOR==1)
-	sound-xtor {
-		compatible = "fsl,imx-audio-xtor";
-		model = "xtor-audio";
-		cpu-dai = <&sai3>;
-		status = "okay";
-	};
-#else
-#if 0
-	bt_sco_codec: bt_sco_codec {
-		#sound-dai-cells = <0>;
-		compatible = "linux,bt-sco";
-	};
-
-	sound-bt-sco {
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "bt-sco-audio";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,bitclock-inversion;
-		simple-audio-card,frame-master = <&btcpu>;
-		simple-audio-card,bitclock-master = <&btcpu>;
-
-		btcpu: simple-audio-card,cpu {
-			sound-dai = <&sai2>;
-			dai-tdm-slot-num = <2>;
-			dai-tdm-slot-width = <16>;
-		};
-
-		simple-audio-card,codec {
-			sound-dai = <&bt_sco_codec>;
-		};
+	sound_hdmi: 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 = "disabled";
 	};
-#endif
-#endif
-		sound_hdmi: 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 = "disabled";
-		};
 
-	sound_wm8983: sound-wm8983 {
+	simple_audio: simple-audio {
 		compatible = "simple-audio-card";
-		status = "okay";
-		simple-audio-card,name = "wm8983-audio";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,frame-master = <&cpudai>;
 		simple-audio-card,bitclock-master = <&cpudai>;
+		simple-audio-card,name = "wm8962-audio";
 		simple-audio-card,widgets =
 			"Headphone", "Headphone Jack",
-			"Speaker", "Speaker", 
+			"Speaker", "Speaker",
 			"Line","LineIn Jack",
 			"Microphone", "Microphone";
 		simple-audio-card,routing =
-			"Headphone Jack", "HPL",
-			"Headphone Jack", "HPR",
-			"Headphone Jack", "OUT4",
-			"Speaker", "SPKL",
-			"Speaker", "SPKR",
-			"LineIn Jack", "L2",
-			"LineIn Jack", "R2",
-			"Microphone", "LIP",
-			"Microphone", "LIN",
+			"Headphone Jack", "HPOUTL",
+			"Headphone Jack", "HPOUTR",
+			"Speaker", "SPKOUT",
+			"IN4L", "LineIn Jack",
+			"IN4R", "LineIn Jack",
+			"IN1L", "Microphone",
+			"IN1R", "Microphone",
 			"Microphone", "MICBIAS";
 
 		cpudai: simple-audio-card,cpu {
@@ -285,17 +248,11 @@ cpudai: simple-audio-card,cpu {
 		};
 
 		simple-audio-card,codec {
-			sound-dai = <&wm8983>;
+			sound-dai = <&audiocodec>;
 			clocks = <&clk IMX8MP_CLK_SAI2_ROOT>;
 		};
 	};
 
-	sound-micfil {
-		compatible = "fsl,imx-audio-micfil";
-		model = "imx-audio-micfil";
-		cpu-dai = <&micfil>;
-	};
-
 	backlight1: backlight1 {
 		compatible = "pwm-backlight";
 		pwms = <&pwm1 0 100000 0>;
@@ -343,6 +300,9 @@ opp-25M {
 	opp-100M {
 			opp-hz = /bits/ 64 <100000000>;
 		};
+&aud2htx {
+	#sound-dai-cells = <0>;
+};
 
 	opp-750M {
 			opp-hz = /bits/ 64 <750000000>;
@@ -734,13 +694,21 @@ ldo5: LDO5 {
 		};
 	};
 
-	wm8983: wm8983@1a {	/* Audio-Codec */
+	audiocodec: wm8962@1a {	/* Audio-Codec */
 		#sound-dai-cells = <0>;
-		compatible = "kuk,wm8983";
-		status = "okay";
+		compatible = "wlf,wm8962";
 		reg = <0x1a>;
+		spk-mono;
 		clocks = <&clk IMX8MP_CLK_SAI2_ROOT>;
 		clock-names = "mclk";
+		DCVDD-supply = <&reg_1v8>; // Digital Core Supply
+		DBVDD-supply = <&reg_3v3>; // Digital Buffer Supply
+		AVDD-supply = <&reg_1v8>;  // Analog Supply
+		CPVDD-supply = <&reg_1v8>; // Charge Pump Supply (for headphone)
+		MICVDD-supply = <&reg_3v3>; // Microphone Supply
+		PLLVDD-supply = <&reg_1v8>; // PLL Supply
+		SPKVDD1-supply = <&reg_3v3>; // Left Speaker Supply
+		SPKVDD2-supply = <&reg_3v3>; // Right Speaker Supply
 	};
 
 #if 0

arch/arm64/boot/dts/seconorth/trizeps8plus_v1r3.dtsi

@@ -56,9 +56,9 @@ &sai2 {
 };
 
 / {
-	/delete-node/ sound-wm8983;
+	/delete-node/ simple-audio;
 
-	sound_wm8962: sound-wm8962 {
+	simple_audio: simple-audio {
 		compatible = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,frame-master = <&cpudai>;