From ae6d7f7b05df962198730539d8191bc8ac420a26 Mon Sep 17 00:00:00 2001
From: Louis <1270384833@qq.com>
Date: Thu, 16 Jun 2022 09:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E9=9F=B3=E9=A2=91=E8=AE=BE=E5=A4=87=E6=A0=91=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arm64/boot/dts/rockchip/rk3568-linux.dtsi |  5 --
 .../boot/dts/rockchip/rk3568-lubancat2-io.dts |  2 +-
 .../boot/dts/rockchip/rk3568-lubancat2-m.dtsi | 87 +------------------
 3 files changed, 3 insertions(+), 91 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi
index 5623aa8dd15c..73b6a4823e39 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-linux.dtsi
@@ -55,11 +55,6 @@
 	};
 };
 
-&hdmi_sound {
-	status = "okay";
-	rockchip,jack-det;
-};
-
 &reserved_memory {
 	ramoops: ramoops@110000 {
 		compatible = "ramoops";
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts
index b6a9c21955d3..32afd0d032a4 100755
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-io.dts
@@ -7,7 +7,7 @@
 /dts-v1/;
 
 #include "rk3568-lubancat2-io.dtsi"
-#include "rk3568-lubancat2-io-cam.dtsi"
+//#include "rk3568-lubancat2-io-cam.dtsi"
 
 / {
     model = "LubanCat2-IO HDMI";
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi
index 1e3eaac85c7b..0d78994abe5f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat2-m.dtsi
@@ -18,22 +18,6 @@
 / {
 	compatible = "rockchip,lubancat2-m", "rockchip,rk3568";
 
-	audiopwmout_diff: audiopwmout-diff {
-		status = "disabled";
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,name = "rockchip,audiopwmout-diff";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,bitclock-master = <&master>;
-		simple-audio-card,frame-master = <&master>;
-		simple-audio-card,cpu {
-			sound-dai = <&i2s3_2ch>;
-		};
-		master: simple-audio-card,codec {
-			sound-dai = <&dig_acodec>;
-		};
-	};
-
 	dc_12v: dc-12v {
 		compatible = "regulator-fixed";
 		regulator-name = "dc_12v";
@@ -43,21 +27,6 @@
 		regulator-max-microvolt = <12000000>;
 	};
 
-	hdmi_sound: hdmi-sound {
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,name = "rockchip,hdmi";
-		status = "disabled";
-
-		simple-audio-card,cpu {
-				sound-dai = <&i2s0_8ch>;
-		};
-		simple-audio-card,codec {
-				sound-dai = <&hdmi>;
-		};
-	};
-
 	rk_headset: rk-headset {
 		status = "disabled";
 		compatible = "rockchip_headset";
@@ -66,24 +35,6 @@
 		pinctrl-0 = <&hp_det>;
 	};
 
-	pdmics: dummy-codec {
-		status = "disabled";
-		compatible = "rockchip,dummy-codec";
-		#sound-dai-cells = <0>;
-	};
-
-	pdm_mic_array: pdm-mic-array {
-		status = "disabled";
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "rockchip,pdm-mic-array";
-		simple-audio-card,cpu {
-			sound-dai = <&pdm>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&pdmics>;
-		};
-	};
-
 	rk809_sound: rk809-sound {
 		status = "okay";
 		compatible = "simple-audio-card";
@@ -93,7 +44,7 @@
 		simple-audio-card,widgets =
                         "Microphone", "Mic Jack",
                         "Headphone", "Headphone Jack";
-        simple-audio-card,routing =
+	        simple-audio-card,routing =
                         "Mic Jack", "MICBIAS1",
                         "IN1P", "Mic Jack",
                         "Headphone Jack", "HPOL",
@@ -106,32 +57,6 @@
 		};
 	};
 
-	spdif-sound {
-		status = "okay";
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "ROCKCHIP,SPDIF";
-		simple-audio-card,cpu {
-				sound-dai = <&spdif_8ch>;
-		};
-		simple-audio-card,codec {
-				sound-dai = <&spdif_out>;
-		};
-	};
-
-	spdif_out: spdif-out {
-			status = "okay";
-			compatible = "linux,spdif-dit";
-			#sound-dai-cells = <0>;
-	};
-
-	vad_sound: vad-sound {
-		status = "disabled";
-		compatible = "rockchip,multicodecs-card";
-		rockchip,card-name = "rockchip,rk3568-vad";
-		rockchip,cpu = <&i2s1_8ch>;
-		rockchip,codec = <&rk809_codec>, <&vad>;
-	};
-
 	vcc3v3_sys: vcc3v3-sys {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3_sys";
@@ -197,11 +122,7 @@
 		regulator-state-mem {
 			regulator-off-in-suspend;
 		};
-	};
-
-	test-power {
-		status = "okay";
-	};
+	};	
 };
 
 &cpu0 {
@@ -274,10 +195,6 @@
 	status = "disabled";
 };
 
-&hdmi_sound {
-	status = "okay";
-};
-
 &i2c0 {
 	status = "okay";