mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3588s-tablet: use multicodecs instead of simple-audio-card

Browse Source 
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: I6c4b970fbbe42dd5bf185b75eae6ba6cad1657c5
This commit is contained in:
Shunhua Lan
2021-12-20 11:56:31 +08:00
parent 6d0528b160
commit 9e859cce5f
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,18 +96,38 @@
es8388_sound: es8388-sound {
status = "okay";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,name = "rockchip,es8388-codec";
simple-audio-card,dai-link@0 {
format = "i2s";
cpu {
sound-dai = <&i2s0_8ch>;
};
codec {
sound-dai = <&es8388>;
};
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,es8388-codec";
hp-det-gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
io-channels = <&saradc 3>;
io-channel-names = "adc-detect";
keyup-threshold-microvolt = <1800000>;
poll-interval = <100>;
spk-con-gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
hp-con-gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
rockchip,format = "i2s";
rockchip,mclk-fs = <256>;
rockchip,cpu = <&i2s0_8ch>;
rockchip,codec = <&es8388>;
rockchip,audio-routing =
"Headphone", "LOUT1",
"Headphone", "ROUT1",
"Speaker", "LOUT2",
"Speaker", "ROUT2",
"Headphone", "Headphone Power",
"Headphone", "Headphone Power",
"Speaker", "Speaker Power",
"Speaker", "Speaker Power",
"LINPUT1", "Main Mic",
"LINPUT2", "Main Mic",
"RINPUT1", "Headset Mic",
"RINPUT2", "Headset Mic";
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
play-pause-key {
label = "playpause";
linux,code = <KEY_PLAYPAUSE>;
press-threshold-microvolt = <2000>;
};
};
@@ -154,15 +174,6 @@
};
};
rk_headset: rk-headset {
status = "okay";
compatible = "rockchip_headset";
headset_gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&hp_det>;
io-channels = <&saradc 3>;
};
vcc3v3_lcd_edp: vcc3v3-lcd-edp {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_lcd_edp";
@@ -375,9 +386,6 @@
assigned-clock-rates = <12288000>;
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>;
};
es7202: es7202@32 {