diff --git a/nv-platform/tegra234-p3740-0002.dtsi b/nv-platform/tegra234-p3740-0002.dtsi
index f919da6..5445d49 100644
--- a/nv-platform/tegra234-p3740-0002.dtsi
+++ b/nv-platform/tegra234-p3740-0002.dtsi
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 #include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
 
@@ -122,6 +122,10 @@
 			"Microphone",   "CVB-RT Int Mic";
 
 		routing =
+			/* I2S4 <-> RT5640 */
+			"CVB-RT AIF1 Playback",       "I2S4 DAP-Playback",
+			"I2S4 DAP-Capture",           "CVB-RT AIF1 Capture",
+			/* RT5640 codec controls */
 			"CVB-RT Headphone Jack",     "CVB-RT HPOL",
 			"CVB-RT Headphone Jack",     "CVB-RT HPOR",
 			"CVB-RT IN1P",               "CVB-RT Mic Jack",
diff --git a/nv-platform/tegra234-p3971-0000+p3701-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3971-0000+p3701-xxxx-nv-common.dtsi
index 7f48114..fdd2d34 100644
--- a/nv-platform/tegra234-p3971-0000+p3701-xxxx-nv-common.dtsi
+++ b/nv-platform/tegra234-p3971-0000+p3701-xxxx-nv-common.dtsi
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2024-2025, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 #include "nv-soc/tegra234-overlay.dtsi"
 #include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
@@ -315,42 +315,4 @@
 	soctherm-oc-event {
 		status = "okay";
 	};
-
-	sound {
-		status = "okay";
-		compatible = "nvidia,tegra186-audio-graph-card",
-			   "nvidia,tegra186-ape";
-		clocks = <&bpmp TEGRA234_CLK_PLLA>,
-		       <&bpmp TEGRA234_CLK_PLLA_OUT0>,
-		       <&bpmp TEGRA234_CLK_AUD_MCLK>;
-		clock-names = "pll_a", "plla_out0", "extern1";
-		assigned-clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
-		assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLA_OUT0>;
-
-		nvidia-audio-card,name = "NVIDIA IGX500 Orin APE";
-
-		nvidia-audio-card,mclk-fs = <256>;
-
-		nvidia-audio-card,widgets =
-			"Headphone",    "CVB-RT Headphone Jack",
-			"Microphone",   "CVB-RT Mic Jack",
-			"Microphone",   "CVB-RT Int Mic";
-
-		nvidia-audio-card,routing =
-			"CVB-RT Headphone Jack",     "CVB-RT HPOL",
-			"CVB-RT Headphone Jack",     "CVB-RT HPOR",
-			"CVB-RT IN1P",               "CVB-RT Mic Jack",
-			"CVB-RT IN2P",               "CVB-RT Mic Jack",
-			"CVB-RT DMIC1",              "CVB-RT Int Mic",
-			"CVB-RT DMIC2",              "CVB-RT Int Mic";
-
-		/* I2S4 dai node */
-		nvidia-audio-card,dai-link@79 {
-			link-name = "rt5640-playback";
-			codec {
-				sound-dai = <&rt5640 0>;
-				prefix = "CVB-RT";
-			};
-		};
-	};
 };
diff --git a/nv-soc/tegra234-soc-audio-dai-links.dtsi b/nv-soc/tegra234-soc-audio-dai-links.dtsi
index ba89b38..ab2f7c8 100644
--- a/nv-soc/tegra234-soc-audio-dai-links.dtsi
+++ b/nv-soc/tegra234-soc-audio-dai-links.dtsi
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2019-2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2019-2025, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 / {
 	tegra_sound: sound {
-		nvidia,ahub-c2c-links;
-
 		/* mixer-controls node provide controls to override PCM params */
 		mixer-controls {
 			compatible = "nvidia,tegra234-mixer-control";
diff --git a/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts b/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
index 7fcc847..96bf1ee 100644
--- a/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2023-2025, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 /dts-v1/;
 /plugin/;
@@ -53,7 +53,10 @@
 					"Speaker",	"CVB-RT Int Spk",
 					"Microphone",	"CVB-RT Int Mic";
 
-				routing =
+				routing = /* I2S1 <-> RT5640 */
+					"CVB-RT AIF1 Playback",       "I2S1 DAP-Playback",
+					"I2S1 DAP-Capture",           "CVB-RT AIF1 Capture",
+					/* RT5640 codec controls */
 					"CVB-RT Headphone Jack",     "CVB-RT HPOL",
 					"CVB-RT Headphone Jack",     "CVB-RT HPOR",
 					"CVB-RT IN1P",		     "CVB-RT Mic Jack",