From e81323a683a4c7f0e79e024a27aceacf1a0db35d Mon Sep 17 00:00:00 2001
From: XiaoTan Luo <lxt@rock-chips.com>
Date: Wed, 1 Dec 2021 14:26:53 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3588-evb1-lp4: use "multicodecs"
 instead of "simple-audio-card"

Used to support jack detection events

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: Ie24eb93fbff9e2dcee12bb6de1ac96dd3e131fb5
---
 .../boot/dts/rockchip/rk3588-evb1-lp4.dtsi    | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
index 34b6f9399264..eaf75cf102a5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
@@ -12,19 +12,32 @@
 / {
 	es8388_sound: es8388-sound {
 		status = "okay";
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "rockchip,es8388-codec";
-		simple-audio-card,dai-link@0 {
-			format = "i2s";
-			cpu {
-				sound-dai = <&i2s0_8ch>;
-			};
-			codec {
-				sound-dai = <&es8388>;
-			};
-		};
+		compatible = "rockchip,multicodecs-card";
+		rockchip,card-name = "rockchip,es8388-codec";
+		hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
+		io-channels = <&saradc 3>;
+		io-channel-names = "adc-detect";
+		spk-con-gpio = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
+		hp-con-gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
+		rockchip,format = "i2s";
+		rockchip,mclk-fs = <256>;
+		rockchip,cpu = <&i2s0_8ch>;
+		rockchip,codec = <&es8388>;
+		rockchip,audio-routing =
+			"Headphone", "LOUT1",
+			"Headphone", "ROUT1",
+			"Speaker", "LOUT2",
+			"Speaker", "ROUT2",
+			"Headphone", "Headphone Power",
+			"Headphone", "Headphone Power",
+			"Speaker", "Speaker Power",
+			"Speaker", "Speaker Power",
+			"LINPUT1", "Main Mic",
+			"LINPUT2", "Main Mic",
+			"RINPUT1", "Headset Mic",
+			"RINPUT2", "Headset Mic";
+		pinctrl-names = "default";
+		pinctrl-0 = <&hp_det>;
 	};
 
 	pcie20_avdd0v85: pcie20-avdd0v85 {
@@ -64,7 +77,7 @@
 	};
 
 	rk_headset: rk-headset {
-		status = "okay";
+		status = "disabled";
 		compatible = "rockchip_headset";
 		headset_gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
@@ -425,9 +438,6 @@
 		assigned-clock-rates = <12288000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&i2s0_mclk>;
-		spk-con-gpio = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
-		hp-con-gpio = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
-		extcon = <&rk_headset>;
 	};
 };