diff --git a/arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi
index 0d5be2455cd0..7035a4eb2e8a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3528-pinctrl.dtsi
@@ -363,60 +363,148 @@
 
 	i2s0 {
 		/omit-if-no-ref/
-		i2s0m0_pins: i2s0m0-pins {
+		i2s0m0_lrck: i2s0m0-lrck {
 			rockchip,pins =
 				/* i2s0_lrck_m0 */
-				<3 RK_PB6 1 &pcfg_pull_none>,
+				<3 RK_PB6 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m0_mclk: i2s0m0-mclk {
+			rockchip,pins =
 				/* i2s0_mclk_m0 */
-				<3 RK_PB4 1 &pcfg_pull_none>,
+				<3 RK_PB4 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m0_sclk: i2s0m0-sclk {
+			rockchip,pins =
 				/* i2s0_sclk_m0 */
-				<3 RK_PB5 1 &pcfg_pull_none>,
-				/* i2s0_sdi_m0 */
-				<3 RK_PB7 1 &pcfg_pull_none>,
-				/* i2s0_sdo_m0 */
+				<3 RK_PB5 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m0_sdi: i2s0m0-sdi {
+			rockchip,pins =
+				/* i2s0m0_sdi */
+				<3 RK_PB7 1 &pcfg_pull_none>;
+		};
+		/omit-if-no-ref/
+		i2s0m0_sdo: i2s0m0-sdo {
+			rockchip,pins =
+				/* i2s0m0_sdo */
 				<3 RK_PC0 1 &pcfg_pull_none>;
 		};
 
 		/omit-if-no-ref/
-		i2s0m1_pins: i2s0m1-pins {
+		i2s0m1_lrck: i2s0m1-lrck {
 			rockchip,pins =
 				/* i2s0_lrck_m1 */
-				<1 RK_PB6 1 &pcfg_pull_none>,
+				<1 RK_PB6 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m1_mclk: i2s0m1-mclk {
+			rockchip,pins =
 				/* i2s0_mclk_m1 */
-				<1 RK_PB4 1 &pcfg_pull_none>,
+				<1 RK_PB4 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m1_sclk: i2s0m1-sclk {
+			rockchip,pins =
 				/* i2s0_sclk_m1 */
-				<1 RK_PB5 1 &pcfg_pull_none>,
-				/* i2s0_sdi_m1 */
-				<1 RK_PB7 1 &pcfg_pull_none>,
-				/* i2s0_sdo_m1 */
+				<1 RK_PB5 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s0m1_sdi: i2s0m1-sdi {
+			rockchip,pins =
+				/* i2s0m1_sdi */
+				<1 RK_PB7 1 &pcfg_pull_none>;
+		};
+		/omit-if-no-ref/
+		i2s0m1_sdo: i2s0m1-sdo {
+			rockchip,pins =
+				/* i2s0m1_sdo */
 				<1 RK_PC0 1 &pcfg_pull_none>;
 		};
 	};
 
 	i2s1 {
 		/omit-if-no-ref/
-		i2s1_pins: i2s1-pins {
+		i2s1_lrck: i2s1-lrck {
 			rockchip,pins =
 				/* i2s1_lrck */
-				<4 RK_PA6 1 &pcfg_pull_none>,
+				<4 RK_PA6 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_mclk: i2s1-mclk {
+			rockchip,pins =
 				/* i2s1_mclk */
-				<4 RK_PA4 1 &pcfg_pull_none>,
+				<4 RK_PA4 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sclk: i2s1-sclk {
+			rockchip,pins =
 				/* i2s1_sclk */
-				<4 RK_PA5 1 &pcfg_pull_none>,
+				<4 RK_PA5 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdi0: i2s1-sdi0 {
+			rockchip,pins =
 				/* i2s1_sdi0 */
-				<4 RK_PB4 1 &pcfg_pull_none>,
+				<4 RK_PB4 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdi1: i2s1-sdi1 {
+			rockchip,pins =
 				/* i2s1_sdi1 */
-				<4 RK_PB3 1 &pcfg_pull_none>,
+				<4 RK_PB3 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdi2: i2s1-sdi2 {
+			rockchip,pins =
 				/* i2s1_sdi2 */
-				<4 RK_PA3 1 &pcfg_pull_none>,
+				<4 RK_PA3 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdi3: i2s1-sdi3 {
+			rockchip,pins =
 				/* i2s1_sdi3 */
-				<4 RK_PA2 1 &pcfg_pull_none>,
+				<4 RK_PA2 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdo0: i2s1-sdo0 {
+			rockchip,pins =
 				/* i2s1_sdo0 */
-				<4 RK_PA7 1 &pcfg_pull_none>,
+				<4 RK_PA7 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdo1: i2s1-sdo1 {
+			rockchip,pins =
 				/* i2s1_sdo1 */
-				<4 RK_PB0 1 &pcfg_pull_none>,
+				<4 RK_PB0 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdo2: i2s1-sdo2 {
+			rockchip,pins =
 				/* i2s1_sdo2 */
-				<4 RK_PB1 1 &pcfg_pull_none>,
+				<4 RK_PB1 1 &pcfg_pull_none>;
+		};
+
+		/omit-if-no-ref/
+		i2s1_sdo3: i2s1-sdo3 {
+			rockchip,pins =
 				/* i2s1_sdo3 */
 				<4 RK_PB2 1 &pcfg_pull_none>;
 		};
diff --git a/arch/arm64/boot/dts/rockchip/rk3528.dtsi b/arch/arm64/boot/dts/rockchip/rk3528.dtsi
index 683f3604986a..288e66d431db 100644
--- a/arch/arm64/boot/dts/rockchip/rk3528.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3528.dtsi
@@ -1968,7 +1968,10 @@
 		resets = <&cru SRST_MRESETN_SAI_I2S0>, <&cru SRST_HRESETN_SAI_I2S0>;
 		reset-names = "m", "h";
 		pinctrl-names = "default";
-		pinctrl-0 = <&i2s0m0_pins>;
+		pinctrl-0 = <&i2s0m0_lrck
+			     &i2s0m0_sclk
+			     &i2s0m0_sdi
+			     &i2s0m0_sdo>;
 		#sound-dai-cells = <0>;
 		status = "disabled";
 	};
@@ -1998,7 +2001,16 @@
 		resets = <&cru SRST_MRESETN_SAI_I2S1>, <&cru SRST_HRESETN_SAI_I2S1>;
 		reset-names = "m", "h";
 		pinctrl-names = "default";
-		pinctrl-0 = <&i2s1_pins>;
+		pinctrl-0 = <&i2s1_sclk
+			     &i2s1_lrck
+			     &i2s1_sdi0
+			     &i2s1_sdi1
+			     &i2s1_sdi2
+			     &i2s1_sdi3
+			     &i2s1_sdo0
+			     &i2s1_sdo1
+			     &i2s1_sdo2
+			     &i2s1_sdo3>;
 		#sound-dai-cells = <0>;
 		status = "disabled";
 	};