diff --git a/arch/arm64/boot/dts/amlogic/kvim_linux.dts b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
index d3a4ff13f77ba..30ee965015ed9 100644
--- a/arch/arm64/boot/dts/amlogic/kvim_linux.dts
+++ b/arch/arm64/boot/dts/amlogic/kvim_linux.dts
@@ -1180,8 +1180,6 @@
 
 &pwm_aoab {
 	status = "disabled";
-	pinctrl-names="default";
-	pinctrl-0=<&pwm_ao_a_pin>;
 };
 
 &pwm_ef {
diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim/pwm_ao_a.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim/pwm_ao_a.dts
index 42217c1bd6c2b..7c4e35a2feb77 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim/pwm_ao_a.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim/pwm_ao_a.dts
@@ -6,6 +6,8 @@
 		target = <&pwm_aoab>;
 
 		__overlay__ {
+			pinctrl-names="default";
+			pinctrl-0=<&pwm_ao_a_pin>;
 			status = "okay";
 		};
 	};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3/i2s.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim3/i2s.dts
index 5cf3a162e13e1..3d6e1a922bda3 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim3/i2s.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3/i2s.dts
@@ -7,6 +7,34 @@
 
 		__overlay__ {
 			aml-audio-card,dai-link@0 {
+				format = "i2s";
+				mclk-fs = <256>;
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				bitclock-master = <&aml_tdmb>;
+				frame-master = <&aml_tdmb>;
+				//bitclock-master = <&tdmbcodec>;
+				//frame-master = <&tdmbcodec>;
+				/* suffix-name, sync with android audio hal
+				 * what's the dai link used for
+				 */
+				suffix-name = "alsaPORT-i2s";
+				cpu {
+					sound-dai = <&aml_tdmb>;
+					dai-tdm-slot-tx-mask = <1 1>;
+					dai-tdm-slot-rx-mask = <1 1>;
+					dai-tdm-slot-num = <2>;
+					dai-tdm-slot-width = <32>;
+					system-clock-frequency = <12288000>;
+				};
+				tdmbcodec: codec {
+					sound-dai = <&dummy_codec &dummy_codec
+						&amlogic_codec>;
+				};
+			};
+
+			aml-audio-card,dai-link@1 {
 				mclk-fs = <128>;
 				/* suffix-name, sync with android audio hal
 				 * what's the dai link used for
@@ -21,7 +49,7 @@
 				};
 			};
 
-			aml-audio-card,dai-link@1 {
+			aml-audio-card,dai-link@2 {
 				format = "dsp_a";
 				mclk-fs = <512>;
 				//continuous-clock;
@@ -48,34 +76,6 @@
 				};
 			};
 
-			aml-audio-card,dai-link@2 {
-				format = "i2s";
-				mclk-fs = <256>;
-				//continuous-clock;
-				//bitclock-inversion;
-				//frame-inversion;
-				bitclock-master = <&aml_tdmb>;
-				frame-master = <&aml_tdmb>;
-				//bitclock-master = <&tdmbcodec>;
-				//frame-master = <&tdmbcodec>;
-				/* suffix-name, sync with android audio hal
-				 * what's the dai link used for
-				 */
-				suffix-name = "alsaPORT-i2s";
-				cpu {
-					sound-dai = <&aml_tdmb>;
-					dai-tdm-slot-tx-mask = <1 1>;
-					dai-tdm-slot-rx-mask = <1 1>;
-					dai-tdm-slot-num = <2>;
-					dai-tdm-slot-width = <32>;
-					system-clock-frequency = <12288000>;
-				};
-				tdmbcodec: codec {
-					sound-dai = <&dummy_codec &dummy_codec
-					&amlogic_codec>;
-				};
-			};
-
 			aml-audio-card,dai-link@3 {
 				format = "i2s";
 				mclk-fs = <256>;
diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/i2s.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/i2s.dts
index 41773326199d3..381afd264110c 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/i2s.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/i2s.dts
@@ -7,6 +7,43 @@
 
 		__overlay__ {
 			aml-audio-card,dai-link@0 {
+				format = "i2s";// "dsp_a";
+				mclk-fs = <256>;
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				/* master mode */
+				bitclock-master = <&tdmb>;
+				frame-master = <&tdmb>;
+				/* slave mode */
+				//bitclock-master = <&tdmbcodec>;
+				//frame-master = <&tdmbcodec>;
+				/* suffix-name, sync with android audio hal
+				 * what's the dai link used for
+				 */
+				suffix-name = "alsaPORT-i2s";
+				cpu {
+					sound-dai = <&tdmb>;
+					dai-tdm-slot-tx-mask = <1 1>;
+					dai-tdm-slot-rx-mask = <1 1>;
+					dai-tdm-slot-num = <2>;
+					/*
+					 * dai-tdm-slot-tx-mask =
+					 *  <1 1 1 1 1 1 1 1>;
+					 * dai-tdm-slot-rx-mask =
+					 *  <1 1 1 1 1 1 1 1>;
+					 * dai-tdm-slot-num = <8>;
+					 */
+					dai-tdm-slot-width = <32>;
+					system-clock-frequency = <12288000>;
+				};
+				tdmbcodec: codec {
+					sound-dai = <&dummy_codec &dummy_codec
+						&amlogic_codec>;
+				};
+			};
+
+			aml-audio-card,dai-link@1 {
 				mclk-fs = <128>;
 				/* suffix-name, sync with android audio hal
 				 * what's the dai link used for
@@ -21,7 +58,7 @@
 				};
 			};
 
-			aml-audio-card,dai-link@1 {
+			aml-audio-card,dai-link@2 {
 				format = "dsp_a";
 				mclk-fs = <512>;
 				//continuous-clock;
@@ -51,43 +88,6 @@
 				};
 			};
 
-			aml-audio-card,dai-link@2 {
-				format = "i2s";// "dsp_a";
-				mclk-fs = <256>;
-				//continuous-clock;
-				//bitclock-inversion;
-				//frame-inversion;
-				/* master mode */
-				bitclock-master = <&tdmb>;
-				frame-master = <&tdmb>;
-				/* slave mode */
-				//bitclock-master = <&tdmbcodec>;
-				//frame-master = <&tdmbcodec>;
-				/* suffix-name, sync with android audio hal
-				 * what's the dai link used for
-				 */
-				suffix-name = "alsaPORT-i2s";
-				cpu {
-					sound-dai = <&tdmb>;
-					dai-tdm-slot-tx-mask = <1 1>;
-					dai-tdm-slot-rx-mask = <1 1>;
-					dai-tdm-slot-num = <2>;
-					/*
-					 * dai-tdm-slot-tx-mask =
-					 *	<1 1 1 1 1 1 1 1>;
-					 * dai-tdm-slot-rx-mask =
-					 *	<1 1 1 1 1 1 1 1>;
-					 * dai-tdm-slot-num = <8>;
-					 */
-					dai-tdm-slot-width = <32>;
-					system-clock-frequency = <12288000>;
-				};
-				tdmbcodec: codec {
-					sound-dai = <&dummy_codec &dummy_codec
-					&amlogic_codec>;
-				};
-			};
-
 			aml-audio-card,dai-link@3 {
 				format = "i2s";
 				mclk-fs = <256>;