From b99d30ed2a5e0cc337352c59cf3c50d02e576c42 Mon Sep 17 00:00:00 2001
From: Hongming Zou <hongming.zou@rock-chips.com>
Date: Fri, 10 Feb 2023 17:16:07 +0800
Subject: [PATCH] ARM: dts: rockchip: rk3036: fix i2s pinctrl

Change-Id: I4e8ddc326c95694ba648545049f56b8804a89ac5
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
---
 arch/arm/boot/dts/rk3036.dtsi | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index b2853011e5ec..447218d5d74b 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -488,7 +488,12 @@
 		resets = <&cru SRST_I2S>;
 		reset-names = "reset-m";
 		pinctrl-names = "default";
-		pinctrl-0 = <&i2s_bus>;
+		pinctrl-0 = <&i2s_mclk
+			     &i2s_sclk
+			     &i2s_lrclkrx
+			     &i2s_lrclktx
+			     &i2s_sdo
+			     &i2s_sdi>;
 		#sound-dai-cells = <0>;
 		status = "disabled";
 	};
@@ -937,13 +942,23 @@
 		};
 
 		i2s {
-			i2s_bus: i2s-bus {
-				rockchip,pins = <1 RK_PA0 1 &pcfg_pull_default>,
-						<1 RK_PA1 1 &pcfg_pull_default>,
-						<1 RK_PA2 1 &pcfg_pull_default>,
-						<1 RK_PA3 1 &pcfg_pull_default>,
-						<1 RK_PA4 1 &pcfg_pull_default>,
-						<1 RK_PA5 1 &pcfg_pull_default>;
+			i2s_mclk: i2s-mclk {
+				rockchip,pins = <1 RK_PA0 1 &pcfg_pull_default>;
+			};
+			i2s_sclk: i2s-sclk {
+				rockchip,pins = <1 RK_PA1 1 &pcfg_pull_default>;
+			};
+			i2s_lrclkrx: i2s-lrclkrx {
+				rockchip,pins = <1 RK_PA2 1 &pcfg_pull_default>;
+			};
+			i2s_lrclktx: i2s-lrclktx {
+				rockchip,pins = <1 RK_PA3 1 &pcfg_pull_default>;
+			};
+			i2s_sdo: i2s-sdo {
+				rockchip,pins = <1 RK_PA4 1 &pcfg_pull_default>;
+			};
+			i2s_sdi: i2s-sdi {
+				rockchip,pins = <1 RK_PA5 1 &pcfg_pull_default>;
 			};
 		};