From cb1aa9dde3cb68e4f7758936f2334903744c4b83 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Wed, 5 Jul 2023 10:55:58 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3588: Add pinctrl-idle/clk for PDM

pinctrl-default/idle/clk must be paired in the same iomux group.

DON'T USE pdm1m0-default with pdm1m1-idle

Ref: commit: 0d9748600792 ("ASoC: rockchip: pdm: Fix clk glitch on runtime PM")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iea86fc5a16eaec8b39c31708228732b49ccda5d7
---
 .../boot/dts/rockchip/rk3588s-pinctrl.dtsi    | 37 +++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3588s.dtsi     | 18 +++++----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi
index 5e050745319f..c8a80600d439 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi
@@ -1846,6 +1846,15 @@
 				<1 RK_PC4 3 &pcfg_pull_none>;
 		};
 
+		/omit-if-no-ref/
+		pdm0m0_idle: pdm0m0-idle {
+			rockchip,pins =
+				/* pdm0m0_clk0_gpio */
+				<1 RK_PC6 0 &pcfg_pull_none>,
+				/* pdm0m0_clk1_gpio */
+				<1 RK_PC4 0 &pcfg_pull_none>;
+		};
+
 		/omit-if-no-ref/
 		pdm0m0_sdi0: pdm0m0-sdi0 {
 			rockchip,pins =
@@ -1887,6 +1896,15 @@
 				<0 RK_PC4 2 &pcfg_pull_none>;
 		};
 
+		/omit-if-no-ref/
+		pdm0m1_idle: pdm0m1-idle {
+			rockchip,pins =
+				/* pdm0m1_clk0_gpio */
+				<0 RK_PC0 0 &pcfg_pull_none>,
+				/* pdm0m1_clk1_gpio */
+				<0 RK_PC4 0 &pcfg_pull_none>;
+		};
+
 		/omit-if-no-ref/
 		pdm0m1_sdi0: pdm0m1-sdi0 {
 			rockchip,pins =
@@ -1931,6 +1949,15 @@
 				<4 RK_PD4 2 &pcfg_pull_none>;
 		};
 
+		/omit-if-no-ref/
+		pdm1m0_idle: pdm1m0-idle {
+			rockchip,pins =
+				/* pdm1m0_clk0_gpio */
+				<4 RK_PD5 0 &pcfg_pull_none>,
+				/* pdm1m0_clk1_gpio */
+				<4 RK_PD4 0 &pcfg_pull_none>;
+		};
+
 		/omit-if-no-ref/
 		pdm1m0_sdi0: pdm1m0-sdi0 {
 			rockchip,pins =
@@ -1958,6 +1985,7 @@
 				/* pdm1m0_sdi3 */
 				<4 RK_PD0 2 &pcfg_pull_none>;
 		};
+
 		/omit-if-no-ref/
 		pdm1m1_clk: pdm1m1-clk {
 			rockchip,pins =
@@ -1972,6 +2000,15 @@
 				<1 RK_PB3 2 &pcfg_pull_none>;
 		};
 
+		/omit-if-no-ref/
+		pdm1m1_idle: pdm1m1-idle {
+			rockchip,pins =
+				/* pdm1m1_clk0_gpio */
+				<1 RK_PB4 0 &pcfg_pull_none>,
+				/* pdm1m1_clk1_gpio */
+				<1 RK_PB3 0 &pcfg_pull_none>;
+		};
+
 		/omit-if-no-ref/
 		pdm1m1_sdi0: pdm1m1-sdi0 {
 			rockchip,pins =
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
index 517157984cc8..791ca6a823ef 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
@@ -5615,13 +5615,14 @@
 		clock-names = "pdm_clk", "pdm_hclk";
 		dmas = <&dmac0 4>;
 		dma-names = "rx";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pdm0m0_clk
-			     &pdm0m0_clk1
-			     &pdm0m0_sdi0
+		pinctrl-names = "default", "idle", "clk";
+		pinctrl-0 = <&pdm0m0_sdi0
 			     &pdm0m0_sdi1
 			     &pdm0m0_sdi2
 			     &pdm0m0_sdi3>;
+		pinctrl-1 = <&pdm0m0_idle>;
+		pinctrl-2 = <&pdm0m0_clk
+			     &pdm0m0_clk1>;
 		#sound-dai-cells = <0>;
 		status = "disabled";
 	};
@@ -5636,13 +5637,14 @@
 		dmas = <&dmac1 4>;
 		dma-names = "rx";
 		power-domains = <&power RK3588_PD_AUDIO>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pdm1m0_clk
-			     &pdm1m0_clk1
-			     &pdm1m0_sdi0
+		pinctrl-names = "default", "idle", "clk";
+		pinctrl-0 = <&pdm1m0_sdi0
 			     &pdm1m0_sdi1
 			     &pdm1m0_sdi2
 			     &pdm1m0_sdi3>;
+		pinctrl-1 = <&pdm1m0_idle>;
+		pinctrl-2 = <&pdm1m0_clk
+			     &pdm1m0_clk1>;
 		#sound-dai-cells = <0>;
 		status = "disabled";
 	};