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

arm64: dts: rockchip: rk3588 board: modify configs for sound cards and headset

Browse Source 
1. set hp-det pin pcfg_pull_none all evbs
2. enable headset for rk3588s-tablets
3. add "everest,es8323" string to es8388 compatible property for rk3588s-tablets

Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I85ae0bc78c2058d38ed768da7233d86cdb0c301f
This commit is contained in:
Shunhua Lan
2021-11-15 17:33:40 +08:00
committed by Tao Huang
parent 7a058412d9
commit 3e819876dd
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi
View File

@@ -388,7 +388,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi
View File

@@ -259,7 +259,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi
View File

@@ -945,7 +945,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi
View File

@@ -70,7 +70,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi
View File

@@ -473,7 +473,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi
View File

@@ -837,7 +837,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

2
arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi
View File

@@ -460,7 +460,7 @@
&pinctrl {
headphone {
hp_det: hp-det {
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_down>;
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

11
arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi
View File

@@ -138,7 +138,7 @@
};
rk_headset: rk-headset {
status = "disabled";
status = "okay";
compatible = "rockchip_headset";
headset_gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
@@ -307,11 +307,11 @@
&i2c3 {
status = "okay";
es8388: es8388@10 {
es8388: es8388@11 {
status = "okay";
#sound-dai-cells = <0>;
compatible = "everest,es8388";
reg = <0x10>;
compatible = "everest,es8388", "everest,es8323";
reg = <0x11>;
clocks = <&cru I2S0_8CH_MCLKOUT>;
clock-names = "mclk";
assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
@@ -319,6 +319,8 @@
pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk>;
spk-con-gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
hp-con-gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
extcon = <&rk_headset>;
};
};
@@ -432,6 +434,7 @@
&i2s0_8ch {
status = "okay";
rockchip,clk-trcm = <1>;
pinctrl-0 = <&i2s0_lrck
&i2s0_sclk
&i2s0_sdi0