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

arm64: dts: rockchip: rk3588: Add pinctrl idle for I2S0/2/3

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

DON'T USE i2s2m0-default with i2s2m1-idle

Ref: commit: b935bf8cc83f ("ASoC: rockchip: i2s-tdm: Add support for pinctrl idle state")

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0bf6f1cfb74d7f398050961913439031fa90245f
This commit is contained in:
Sugar Zhang
2023-06-15 20:21:46 +08:00
committed by Tao Huang
parent 0b947f4a87
commit 89e11e98f4
3 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm64/boot/dts/rockchip/rk3588-vccio3-pinctrl.dtsi
View File

@@ -260,6 +260,15 @@
}; };
i2s2 { i2s2 {
/omit-if-no-ref/
i2s2m0_idle: i2s2m0-idle {
rockchip,pins =
/* i2s2m0_lrck_gpio */
<2 RK_PC0 0 &pcfg_pull_none>,
/* i2s2m0_sclk_gpio */
<2 RK_PB7 0 &pcfg_pull_none>;
};
/omit-if-no-ref/ /omit-if-no-ref/
i2s2m0_lrck: i2s2m0-lrck { i2s2m0_lrck: i2s2m0-lrck {
rockchip,pins = rockchip,pins =

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

@@ -1129,6 +1129,15 @@
}; };
i2s0 { i2s0 {
/omit-if-no-ref/
i2s0_idle: i2s0-idle {
rockchip,pins =
/* i2s0_lrck_gpio */
<1 RK_PC5 0 &pcfg_pull_none>,
/* i2s0_sclk_gpio */
<1 RK_PC3 0 &pcfg_pull_none>;
};
/omit-if-no-ref/ /omit-if-no-ref/
i2s0_lrck: i2s0-lrck { i2s0_lrck: i2s0-lrck {
rockchip,pins = rockchip,pins =
@@ -1363,6 +1372,15 @@
}; };
i2s2 { i2s2 {
/omit-if-no-ref/
i2s2m1_idle: i2s2m1-idle {
rockchip,pins =
/* i2s2m1_lrck_gpio */
<3 RK_PB6 0 &pcfg_pull_none>,
/* i2s2m1_sclk_gpio */
<3 RK_PB5 0 &pcfg_pull_none>;
};
/omit-if-no-ref/ /omit-if-no-ref/
i2s2m1_lrck: i2s2m1-lrck { i2s2m1_lrck: i2s2m1-lrck {
rockchip,pins = rockchip,pins =
@@ -1400,6 +1418,15 @@
}; };
i2s3 { i2s3 {
/omit-if-no-ref/
i2s3_idle: i2s3-idle {
rockchip,pins =
/* i2s3_lrck_gpio */
<3 RK_PA2 0 &pcfg_pull_none>,
/* i2s3_sclk_gpio */
<3 RK_PA1 0 &pcfg_pull_none>;
};
/omit-if-no-ref/ /omit-if-no-ref/
i2s3_lrck: i2s3-lrck { i2s3_lrck: i2s3-lrck {
rockchip,pins = rockchip,pins =

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

@@ -5524,10 +5524,8 @@
resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>; resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>;
reset-names = "tx-m", "rx-m"; reset-names = "tx-m", "rx-m";
rockchip,clk-trcm = <1>; rockchip,clk-trcm = <1>;
pinctrl-names = "default"; pinctrl-names = "default", "idle", "clk";
pinctrl-0 = <&i2s0_lrck pinctrl-0 = <&i2s0_sdi0
&i2s0_sclk
&i2s0_sdi0
&i2s0_sdi1 &i2s0_sdi1
&i2s0_sdi2 &i2s0_sdi2
&i2s0_sdi3 &i2s0_sdi3
@@ -5535,6 +5533,9 @@
&i2s0_sdo1 &i2s0_sdo1
&i2s0_sdo2 &i2s0_sdo2
&i2s0_sdo3>; &i2s0_sdo3>;
pinctrl-1 = <&i2s0_idle>;
pinctrl-2 = <&i2s0_lrck
&i2s0_sclk>;
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
@@ -5577,11 +5578,12 @@
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&power RK3588_PD_AUDIO>; power-domains = <&power RK3588_PD_AUDIO>;
rockchip,clk-trcm = <1>; rockchip,clk-trcm = <1>;
pinctrl-names = "default"; pinctrl-names = "default", "idle", "clk";
pinctrl-0 = <&i2s2m1_lrck pinctrl-0 = <&i2s2m1_sdi
&i2s2m1_sclk
&i2s2m1_sdi
&i2s2m1_sdo>; &i2s2m1_sdo>;
pinctrl-1 = <&i2s2m1_idle>;
pinctrl-2 = <&i2s2m1_lrck
&i2s2m1_sclk>;
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };
@@ -5598,11 +5600,12 @@
dma-names = "tx", "rx"; dma-names = "tx", "rx";
power-domains = <&power RK3588_PD_AUDIO>; power-domains = <&power RK3588_PD_AUDIO>;
rockchip,clk-trcm = <1>; rockchip,clk-trcm = <1>;
pinctrl-names = "default"; pinctrl-names = "default", "idle", "clk";
pinctrl-0 = <&i2s3_lrck pinctrl-0 = <&i2s3_sdi
&i2s3_sclk
&i2s3_sdi
&i2s3_sdo>; &i2s3_sdo>;
pinctrl-1 = <&i2s3_idle>;
pinctrl-2 = <&i2s3_lrck
&i2s3_sclk>;
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
status = "disabled"; status = "disabled";
}; };