shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3588: Add pinctrl-idle/clk for PDM

Browse Source 
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
This commit is contained in:
Sugar Zhang
2023-07-05 10:55:58 +08:00
parent 91a11122a7
commit cb1aa9dde3
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi
View File

@@ -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 =

18
arch/arm64/boot/dts/rockchip/rk3588s.dtsi
View File

@@ -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";
};