diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index fdf4f9f4b241..e433209f0bd7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -338,7 +338,8 @@ edp_rk_fb: edp-rk-fb@ff970000 {
 		status = "disabled";
 	};
 
-	hdmi-sound {
+	hdmi_sound: hdmi-sound {
+		status = "disabled";
 		compatible = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
@@ -352,13 +353,13 @@ simple-audio-card,codec {
 	};
 
 	dw_hdmi_audio: dw-hdmi-audio {
+		status = "disabled";
 		compatible = "rockchip,dw-hdmi-audio";
 		#sound-dai-cells = <0>;
 	};
 };
 
 &i2s2 {
-	status = "okay";
 	#sound-dai-cells = <0>;
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
index 19d5dc5b7caa..70e3522c2b09 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
@@ -97,3 +97,15 @@ &hdmi_rk_fb {
 	status = "okay";
 	rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
+
+&i2s2 {
+	status = "okay";
+};
+
+&dw_hdmi_audio {
+	status = "okay";
+};
+
+&hdmi_sound {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
index ffb24ae9abec..0290759f2ee9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
@@ -92,3 +92,15 @@ &hdmi_rk_fb {
 	status = "okay";
 	rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
+
+&i2s2 {
+	status = "okay";
+};
+
+&dw_hdmi_audio {
+	status = "okay";
+};
+
+&hdmi_sound {
+	status = "okay";
+};