diff --git a/arch/arm64/boot/dts/amlogic/mesons7d_audio.dtsi b/arch/arm64/boot/dts/amlogic/mesons7d_audio.dtsi
index 4f11bca34..a7f109414 100644
--- a/arch/arm64/boot/dts/amlogic/mesons7d_audio.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesons7d_audio.dtsi
@@ -158,13 +158,18 @@
 		compatible = "amlogic, t5-snd-tdma";
 		#sound-dai-cells = <0>;
 
-		dai-tdm-lane-slot-mask-in = <1 1>;
-		dai-tdm-lane-slot-mask-out = <1 1>;
+		dai-tdm-lane-slot-mask-in = <1 0>;
+		dai-tdm-lane-slot-mask-out = <0 1>;
 		dai-tdm-clk-sel = <0>;
 		clocks = <&clkaudio CLKID_AUDIO_MCLK_A
 				&clkc CLKID_HIFI_PLL
 				&clkc CLKID_HIFI1_PLL>;
 		clock-names = "mclk", "clk_srcpll", "clk_src_cd";
+		pinctrl-names = "tdm_pins";
+		pinctrl-0 = <&tdm_a_pins
+			&tdm_d0_pins
+			&tdm_d1_pins
+			&tdma_clk_pins>;
 		suspend-clk-off = <1>;
 		/* enable control gain */
 		ctrl_gain = <1>;
@@ -528,18 +533,30 @@
 }; /* end of audiobus */
 
 &periphs_pinctrl {
+	tdm_a_pins: tdm_a_pins {
+		mux { /* GPIOX_11, GPIOX_10, GPIOX_8, GPIOX_9 */
+			groups = "tdm_sclk0",
+				"tdm_fs0",
+				"tdm_d0",
+				"tdm_d1";
+			function = "tdm";
+		};
+	};
+
 	spdif_out_a_h4_pins: spdifout_a_h4 {
 		mux { /* GPIOH_4 */
 			groups = "spdif_out_h4";
 			function = "spdif";
 		};
 	};
+
 	spdifin: spdifin {
 		mux {/* GPIOH_9 */
 			groups = "spdif_in_h9";
 			function = "spdif";
 		};
 	};
+
 	spdif_out_a_h4_mute_pins: spdifout_a_h4_mute {
 		 mux { /* GPIOH_4 */
 			groups = "GPIOH_4";
@@ -567,6 +584,27 @@
 };
 
 &pinctrl_audio {
+	tdm_d0_pins: tdm_d0_pin {
+		mux {
+			groups = "tdm_d0";
+			function = "tdmouta_lane1";
+		};
+	};
+
+	tdm_d1_pins: tdm_d1_pin {
+		mux {
+			groups = "tdm_d1";
+			function = "tdmina_lane0";
+		};
+	};
+
+	tdma_clk_pins: tdm_clk_pin {
+		mux {
+			groups = "tdm_sclk0", "tdm_lrclk0";
+			function = "tdm_clk_outa";
+		};
+	};
+
 	tdm_d2_pins: tdm_d2_pin {
 		mux {
 			groups = "tdm_d2";
diff --git a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts
index 20a1ccee9..f7c7c20e8 100644
--- a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts
+++ b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm201.dts
@@ -940,40 +940,7 @@
 	status = "okay";
 };
 
-&pinctrl_audio {
-	tdm_d0_pins: tdm_d0_pin {
-		mux {
-			groups = "tdm_d0";
-			function = "tdmouta_lane0";
-		};
-	};
-
-	tdm_d1_pins: tdm_d1_pin {
-		mux {
-			groups = "tdm_d1";
-			function = "tdmina_lane0";
-		};
-	};
-
-	tdma_clk_pins: tdm_clk_pin {
-		mux {
-			groups = "tdm_sclk0", "tdm_lrclk0";
-			function = "tdm_clk_outa";
-		};
-	};
-};
-
 &periphs_pinctrl {
-	tdm_a: tdm_a {
-		mux { /* GPIOX_11, GPIOX_10, GPIOX_8, GPIOX_9 */
-			groups = "tdm_sclk0",
-				"tdm_fs0",
-				"tdm_d0",
-				"tdm_d1";
-			function = "tdm";
-		};
-	};
-
 	dvb_s_ts0_pins: dvb_s_ts0_pins {
 		tsin_a {
 			groups = "tsin_a_sop",
diff --git a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm202.dts b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm202.dts
index 7123d19ff..a6d8b256f 100644
--- a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm202.dts
+++ b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm202.dts
@@ -814,40 +814,7 @@
 	status = "okay";
 };
 
-&pinctrl_audio {
-	tdm_d0_pins: tdm_d0_pin {
-		mux {
-			groups = "tdm_d0";
-			function = "tdmouta_lane0";
-		};
-	};
-
-	tdm_d1_pins: tdm_d1_pin {
-		mux {
-			groups = "tdm_d1";
-			function = "tdmina_lane0";
-		};
-	};
-
-	tdma_clk_pins: tdm_clk_pin {
-		mux {
-			groups = "tdm_sclk0", "tdm_lrclk0";
-			function = "tdm_clk_outa";
-		};
-	};
-};
-
 &periphs_pinctrl {
-	tdm_a: tdm_a {
-		mux { /* GPIOX_11, GPIOX_10, GPIOX_8, GPIOX_9 */
-			groups = "tdm_sclk0",
-				"tdm_fs0",
-				"tdm_d0",
-				"tdm_d1";
-			function = "tdm";
-		};
-	};
-
 	dvb_s_ts0_pins: dvb_s_ts0_pins {
 		tsin_a {
 			groups = "tsin_a_sop",
diff --git a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm209.dts b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm209.dts
index a712c418f..9f715b535 100644
--- a/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm209.dts
+++ b/arch/arm64/boot/dts/amlogic/s7d_s905x5m_bm209.dts
@@ -924,40 +924,7 @@
 	status = "okay";
 };
 
-&pinctrl_audio {
-	tdm_d0_pins: tdm_d0_pin {
-		mux {
-			groups = "tdm_d0";
-			function = "tdmouta_lane0";
-		};
-	};
-
-	tdm_d1_pins: tdm_d1_pin {
-		mux {
-			groups = "tdm_d1";
-			function = "tdmina_lane0";
-		};
-	};
-
-	tdma_clk_pins: tdm_clk_pin {
-		mux {
-			groups = "tdm_sclk0", "tdm_lrclk0";
-			function = "tdm_clk_outa";
-		};
-	};
-};
-
 &periphs_pinctrl {
-	tdm_a: tdm_a {
-		mux { /* GPIOX_11, GPIOX_10, GPIOX_8, GPIOX_9 */
-			groups = "tdm_sclk0",
-				"tdm_fs0",
-				"tdm_d0",
-				"tdm_d1";
-			function = "tdm";
-		};
-	};
-
 	dvb_s_ts0_pins: dvb_s_ts0_pins {
 		tsin_a {
 			groups = "tsin_a_sop",