From c3db31bde2461560840fae0279518a2d98f924da Mon Sep 17 00:00:00 2001 From: RadxaNaoki Date: Wed, 16 Nov 2022 19:32:03 +0900 Subject: [PATCH] enable es8316 audio properly (#4433) Signed-off-by: FUKAUMI Naoki Signed-off-by: FUKAUMI Naoki Co-authored-by: Igor --- ...4-0005-arm64-dts-enable-es8316-audio.patch | 54 ++++--------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/patch/kernel/archive/rockchip64-5.15/board-rockpi4-0005-arm64-dts-enable-es8316-audio.patch b/patch/kernel/archive/rockchip64-5.15/board-rockpi4-0005-arm64-dts-enable-es8316-audio.patch index 9e8c65ea35..240400dc4f 100644 --- a/patch/kernel/archive/rockchip64-5.15/board-rockpi4-0005-arm64-dts-enable-es8316-audio.patch +++ b/patch/kernel/archive/rockchip64-5.15/board-rockpi4-0005-arm64-dts-enable-es8316-audio.patch @@ -1,27 +1,21 @@ ---- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2020-04-08 11:27:04.486670792 +0000 -+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi 2020-04-10 19:59:01.945704455 +0000 -@@ -34,6 +34,12 @@ +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +index f4a44813c..d092a676e 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +@@ -36,6 +36,12 @@ sdio_pwrseq: sdio-pwrseq { reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; }; + sound { + compatible = "audio-graph-card"; -+ label = "rockchip,rk3399"; ++ label = "Analog"; + dais = <&i2s0_p0>; + }; + vcc12v_dcin: dc-12v { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; -@@ -132,6 +138,7 @@ - regulator-max-microvolt = <1400000>; - vin-supply = <&vcc5v0_sys>; - }; -+ - }; - - &cpu_l0 { -@@ -434,6 +441,23 @@ +@@ -447,6 +453,20 @@ &i2c1 { i2c-scl-rising-time-ns = <300>; i2c-scl-falling-time-ns = <15>; status = "okay"; @@ -31,8 +25,6 @@ + reg = <0x11>; + clocks = <&cru SCLK_I2S_8CH_OUT>; + clock-names = "mclk"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&i2s_8ch_mclk>; + #sound-dai-cells = <0>; + + port { @@ -41,13 +33,12 @@ + }; + }; + }; -+ }; &i2c3 { -@@ -452,6 +476,15 @@ - rockchip,playback-channels = <8>; - rockchip,capture-channels = <8>; +@@ -466,6 +486,14 @@ &i2s0 { + rockchip,capture-channels = <2>; + rockchip,playback-channels = <2>; status = "okay"; + + i2s0_p0: port { @@ -56,30 +47,7 @@ + mclk-fs = <256>; + remote-endpoint = <&es8316_p0_0>; + }; -+ }; -+ - }; - - &i2s1 { -@@ -583,6 +616,21 @@ - rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; -+ -+ i2s0 { -+ i2s0_8ch_bus: i2s0-8ch-bus { -+ rockchip,pins = -+ <3 24 1 &pcfg_pull_none>, -+ <3 25 1 &pcfg_pull_none>, -+ <3 26 1 &pcfg_pull_none>, -+ <3 27 1 &pcfg_pull_none>, -+ <3 31 1 &pcfg_pull_none>; -+ }; -+ -+ i2s_8ch_mclk: i2s-8ch-mclk { -+ rockchip,pins = <4 0 1 &pcfg_pull_none>; -+ }; + }; }; - &pwm2 { + &i2s1 {