From db84683134040fc3dede0249d2b7812a4507d9d0 Mon Sep 17 00:00:00 2001 From: Zheng zhiqi Date: Tue, 24 Sep 2024 08:53:46 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3576-vehicle-evb-v20: enable saiX 1. enable sai1 for TDM card 2. enable sai2 for BT card 3. enable sai4 for FA caard 4. enable spidev0.0 for audio control Change-Id: Ib9a20936164d5ce5d82ba1736001c66eeaaa8b68 Signed-off-by: Zheng zhiqi --- .../rk3576-vehicle-evb-v20-audio.dtsi | 118 ++++++++++++++++++ .../dts/rockchip/rk3576-vehicle-evb-v20.dtsi | 49 +------- 2 files changed, 119 insertions(+), 48 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20-audio.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20-audio.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20-audio.dtsi new file mode 100644 index 000000000000..61f36b5f6c7c --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20-audio.dtsi @@ -0,0 +1,118 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2024 Rockchip Electronics Co., Ltd. + * + */ + +/ { + + dummy_codec0: dummy-codec@0 { + status = "okay"; + compatible = "rockchip,dummy-codec"; + #sound-dai-cells = <0>; + }; + + dummy_codec1: dummy-codec@1 { + status = "okay"; + compatible = "rockchip,dummy-codec"; + #sound-dai-cells = <0>; + }; + + bt_codec: bt-codec { + compatible = "delta,dfbmcs320"; + #sound-dai-cells = <1>; + status = "okay"; + }; + + sound0 { + status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,name = "rockchip,tdm"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,cpu { + sound-dai = <&sai1>; + dai-tdm-slot-num = <8>; + dai-tdm-slot-width = <32>; + }; + simple-audio-card,codec { + sound-dai = <&dummy_codec0>; + }; + }; + + sound1 { + status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,name = "rockchip,low-latency"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,bitclock-master = <&dummy_clk1>; + simple-audio-card,frame-master = <&dummy_clk1>; + simple-audio-card,cpu { + sound-dai = <&sai4>; + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + }; + dummy_clk1: simple-audio-card,codec { + sound-dai = <&dummy_codec1>; + }; + }; + + sound2 { + compatible = "simple-audio-card"; + simple-audio-card,format = "dsp_a"; + simple-audio-card,bitclock-inversion; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,bt"; + simple-audio-card,cpu { + sound-dai = <&sai2>; + }; + simple-audio-card,codec { + sound-dai = <&bt_codec 1>; + }; + }; +}; + +&sai1 { + status = "okay"; + rockchip,tdm-tx-lanes = <3>; + rockchip,tdm-rx-lanes = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&sai1m0_lrck + &sai1m0_sclk + &sai1m0_sdi0 + &sai1m0_sdi1 + &sai1m0_sdo0 + &sai1m0_sdo1 + &sai1m0_sdo2>; +}; + +&sai2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&sai2m0_lrck + &sai2m0_sclk + &sai2m0_sdi + &sai2m0_sdo>; +}; + +&sai4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&sai4m2_lrck + &sai4m2_sclk + &sai4m2_sdi + &sai4m2_sdo>; +}; + +&spi0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spi0m0_csn0 &spi0m0_pins>; + spi-dev@0 { + compatible = "rockchip,spidev"; + reg = <0x0>; + spi-max-frequency = <50000000>; + spi-lsb-first; + }; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi index 0e2edddf2a97..ff14855b8004 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb-v20.dtsi @@ -5,6 +5,7 @@ */ #include "rk3576-vehicle.dtsi" +#include "rk3576-vehicle-evb-v20-audio.dtsi" #include "rk3576-rk806.dtsi" / { @@ -119,28 +120,6 @@ off-on-delay-us = <16000>; vin-supply = <&vcc5v0_buck>; }; - - dummy_codec: dummy-codec { - status = "okay"; - compatible = "rockchip,dummy-codec"; - #sound-dai-cells = <0>; - }; - - vehicle_adsp_sound: vehicle-adsp-sound { - status = "okay"; - compatible = "simple-audio-card"; - simple-audio-card,name = "rockchip,tdm"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,cpu { - sound-dai = <&sai1>; - dai-tdm-slot-num = <8>; - dai-tdm-slot-width = <32>; - }; - simple-audio-card,codec { - sound-dai = <&dummy_codec>; - }; - }; }; &combphy0_ps { @@ -384,36 +363,10 @@ connect = <&vp0_out_hdmi>; }; -&sai1 { - status = "okay"; - rockchip,tdm-tx-lanes = <3>; - rockchip,tdm-rx-lanes = <2>; - pinctrl-names = "default"; - pinctrl-0 = <&sai1m0_lrck - &sai1m0_sclk - &sai1m0_sdi0 - &sai1m0_sdi1 - &sai1m0_sdo0 - &sai1m0_sdo1 - &sai1m0_sdo2>; -}; - &sdmmc { status = "okay"; }; -&spi0 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&spi0m0_csn0 &spi0m0_pins>; - spi-dev@0 { - compatible = "rockchip,spidev"; - reg = <0x0>; - spi-max-frequency = <50000000>; - spi-lsb-first; - }; -}; - &ufs { vcc-supply = <&vcc_ufs_s0>; vccq-supply = <&vcc1v2_ufs_vccq_s0>;