From cf07d3430200e9281e7265d3ea5b2bcf0537dbf9 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Fri, 21 Mar 2025 00:18:07 +0800 Subject: [PATCH] arm64: dts: rockchip: Add rv1126b-evb1-v10-bt-sco board BT-SCO and ADC/DSM share the same SAI2, so, move BT-SCO to a new dts board for test. Signed-off-by: Sugar Zhang Change-Id: I80c84c8f11e920afbd3c8f170c9707e90471ba1e --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../dts/rockchip/rv1126b-evb1-v10-bt-sco.dts | 55 +++++++++++++++++++ .../boot/dts/rockchip/rv1126b-evb1-v10.dts | 28 ---------- 3 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10-bt-sco.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 86c029ecf5fb..dd9a3600f1fd 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -364,6 +364,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-rk806-single-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-tablet-v11.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb1-v10.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb1-v10-bt-sco.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-mcu-k350c4516t.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rv1126b-evb2-v10-rgb-Q7050ITH2641AA1T.dtb diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10-bt-sco.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10-bt-sco.dts new file mode 100644 index 000000000000..ec33e0112ff1 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10-bt-sco.dts @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2025 Rockchip Electronics Co., Ltd. + */ + +/dts-v1/; +#include "rv1126b-evb1-v10.dts" + +/ { + model = "Rockchip RV1126B EVB1 V10 Board + BT SCO"; + compatible = "rockchip,rv1126b-evb1-v10-bt-sco", "rockchip,rv1126b"; + + bt_sco: bt-sco { + compatible = "delta,dfbmcs320"; + #sound-dai-cells = <1>; + }; + + bt_sound: bt-sound { + 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_sco 1>; + }; + }; +}; + +&acdcdig_dsm { + status = "disabled"; +}; + +&acodec_sound { + status = "disabled"; +}; + +&audio_codec { + status = "disabled"; +}; + +&sai2 { + status = "okay"; + rockchip,slot-width = <16>; + pinctrl-names = "default"; + pinctrl-0 = <&sai2m0_lrck_pins + &sai2m0_sclk_pins + &sai2m0_sdi0_pins + &sai2m0_sdo_pins>; +}; diff --git a/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dts index 4eb8ae0cc516..ac7e73058724 100644 --- a/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rv1126b-evb1-v10.dts @@ -11,29 +11,6 @@ model = "Rockchip RV1126B EVB1 V10 Board"; compatible = "rockchip,rv1126b-evb1-v10", "rockchip,rv1126b"; - bt_sco: bt-sco { - status = "okay"; - compatible = "delta,dfbmcs320"; - #sound-dai-cells = <1>; - }; - - bt_sound: bt-sound { - status = "okay"; - 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_sco 1>; - }; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; pinctrl-names = "default"; @@ -351,11 +328,6 @@ status = "okay"; }; -&sai2 { - rockchip,bclk-fs = <16>; - status = "okay"; -}; - &sdmmc0 { max-frequency = <200000000>; no-sdio;