From a7c067837a05da792594be79d6fa789eb6bd61a9 Mon Sep 17 00:00:00 2001
From: xiane <sangch.go@gmail.com>
Date: Tue, 18 Feb 2025 14:16:01 +0900
Subject: [PATCH] ODROID-M1S: dts/dtbo: Add headset dtbo.

Signed-off-by: xiane <sangch.go@gmail.com>
Change-Id: I01782424e99868ab9d9cf05d7748f13edcc97234
---
 .../boot/dts/rockchip/overlays/odroidm1s/Makefile    |  1 +
 .../boot/dts/rockchip/overlays/odroidm1s/headset.dts | 12 ++++++++++++
 arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts   | 11 +----------
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm1s/headset.dts

diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/Makefile b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/Makefile
index 79f95dca7366..82cb97350528 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/Makefile
@@ -17,6 +17,7 @@ dtbo-$(CONFIG_ARCH_ROCKCHIP_ODROIDM1) += \
 	display_waveshare_1inch69.dtbo \
 	fiq0_to_uart2.dtbo \
 	gpio_shortcut.dtbo \
+	headset.dtbo \
 	hktft32.dtbo \
 	i2c0.dtbo \
 	i2c1.dtbo \
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/headset.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/headset.dts
new file mode 100644
index 000000000000..ad4e8f2cf4a0
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm1s/headset.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&rk_headset>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
index 5795a6a880c9..721fb1744d60 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
@@ -167,10 +167,7 @@
 
 	rk_headset: rk-headset {
 		compatible = "rockchip_headset";
-		headset_gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&hp_det>;
-		io-channels = <&saradc 3>;	//HP_HOOK
+		status = "disabled";
 	};
 
 	rk3566-gpiomem {
@@ -1149,12 +1146,6 @@
 		};
 	};
 
-	headphone {
-		hp_det: hp-det {
-			rockchip,pins = <4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-	};
-
 	leds {
 		led_ctl: led-ctl {
 			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;