diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
index 109b5903c5bc..4282d784cda6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
@@ -159,6 +159,11 @@
 		"", "", "", "", "", "", "", "";
 };
 
+&hdmi_sound {
+	simple-audio-card,name = "ODROID-M1-HDMI";
+	status = "okay";
+};
+
 &i2c3 {
 	status = "disabled";
 	pinctrl-names = "default";
@@ -191,6 +196,11 @@
 	};
 };
 
+&rk809_sound {
+	rockchip,card-name = "ODROID-M1-FRONT";
+	status = "okay";
+};
+
 &sata2 {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi
index 2b5b5192f66f..4fb195d053dd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid.dtsi
@@ -29,6 +29,13 @@
 		};
 	};
 
+	rk_headset: rk-headset {
+		compatible = "rockchip_headset";
+		headset_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&hp_det>;
+	};
+
 	rk3568-gpiomem {
 		compatible = "rockchip,rk3568-gpiomem";
 		reg = <0x0 0xfd660000 0x0 0x1000>;
@@ -63,6 +70,11 @@
 	status = "okay";
 };
 
+&hdmi_sound {
+	/delete-property/ rockchip,jack-det;
+	status = "okay";
+};
+
 &i2c1 {
 	status = "disabled";
 
@@ -113,12 +125,30 @@
 				<1 RK_PD1 1 &pcfg_pull_none>;
 		};
 	};
+
+	headphone {
+		hp_det: hp-det {
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
 };
 
 &pmu_io_domains {
 	vccio4-supply = <&vcc_1v8>;
 };
 
+&rk809_codec {
+	#sound-dai-cells = <0>;
+	hp-volume = <3>;
+	spk-volume = <3>;
+	status = "okay";
+};
+
+&rk809_sound {
+	hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
 &rknpu_mmu {
 	status = "disabled";
 };
@@ -139,6 +169,14 @@
 	cap-mmc-hw-reset;
 };
 
+&spdif_8ch {
+	status = "disabled";
+};
+
+&spdif_out {
+	status = "disabled";
+};
+
 &video_phy0 {
 	status = "okay";
 };