From 3e819876ddeb8ffd252a607adfe0ae4de7ec6777 Mon Sep 17 00:00:00 2001 From: Shunhua Lan Date: Mon, 15 Nov 2021 17:33:40 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588 board: modify configs for sound cards and headset 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 Change-Id: I85ae0bc78c2058d38ed768da7233d86cdb0c301f --- arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi | 11 +++++++---- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index f341fb7b0c32..dae6cf6d75ad 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index ee628ac243dd..da0251508a6f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index 52064c1a2fc1..6ea435405e6a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi index 912b29a1abe0..afc1ca8be4f3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 2a0261f9a6dd..c5b17cbe8a26 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi index 16296b379cef..ecab5acad40d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index 86b8aebd1beb..bfd5045d1ba5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -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>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index 468bf341922b..660d5c2afbc2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -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