From b0849d5790e4abed9f62227ccb70e096d2a8e9c8 Mon Sep 17 00:00:00 2001 From: Jiajian Wu Date: Thu, 21 Jul 2022 17:06:22 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3399-evb-ind: rk809 compatible to rockchip,multicodecs-card RK809 compatible to rockchip,multicodecs-card for jack function Signed-off-by: Jiajian Wu Change-Id: Ia430978a4239dc072f92d5de514285035e1159f7 --- .../boot/dts/rockchip/rk3399-evb-ind.dtsi | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi index f07ead139e4f..f24a312c434c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dtsi @@ -88,23 +88,23 @@ }; rk809_sound: rk809-sound { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "rockchip,rk809-codec"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,widgets = - "Microphone", "Mic Jack", - "Headphone", "Headphone Jack"; - simple-audio-card,routing = - "Mic Jack", "MICBIAS1", - "IN1P", "Mic Jack", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR"; - simple-audio-card,cpu { - sound-dai = <&i2s1>; - }; - simple-audio-card,codec { - sound-dai = <&rk809_codec>; + compatible = "rockchip,multicodecs-card"; + rockchip,card-name = "rockchip-rk809"; + hp-det-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + io-channels = <&saradc 2>; + io-channel-names = "adc-detect"; + keyup-threshold-microvolt = <1800000>; + poll-interval = <100>; + rockchip,format = "i2s"; + rockchip,mclk-fs = <256>; + rockchip,cpu = <&i2s1>; + rockchip,codec = <&rk809_codec>; + pinctrl-names = "default"; + pinctrl-0 = <&hp_det>; + play-pause-key { + label = "playpause"; + linux,code = ; + press-threshold-microvolt = <2000>; }; }; @@ -131,6 +131,7 @@ }; rk_headset: rk-headset { + status = "disabled"; compatible = "rockchip_headset"; headset_gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>; pinctrl-names = "default";