shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3308-evb: switch to multicodecs for bluetooth_sound

Browse Source 
Dues to the loading order of multiple sound cards is
not constant, we need to specify bluetooth pcm sound
as the slave card via 'rockchip,wait-card-locked'
property. It looks like this:

========
From
[    1.180441] ALSA device list:
[    1.180458]   #0: rockchip,rk3308-pcm
[    1.180467]   #1: rockchip,rk3308-vad

To
[    1.175590] ALSA device list:
[    1.175606]   #0: rockchip,rk3308-vad
[    1.175614]   #1: rockchip,rk3308-pcm
========

Change-Id: Ic4d7625ca3b06106a317a59defcc45bab190ae95
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-07-25 10:58:49 +08:00
committed by Tao Huang
parent 94b7e1a99e
commit 85a3a104a2
2 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
View File

@@ -113,23 +113,16 @@
bluetooth_sound: bluetooth-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "dsp_b";
simple-audio-card,name = "rockchip,rk3308-pcm";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,bitclock-inversion = <0>;
simple-audio-card,bitclock-master = <&bt_codec>;
simple-audio-card,frame-master = <&bt_codec>;
simple-audio-card,cpu {
sound-dai = <&i2s_2ch_0>;
};
bt_codec: simple-audio-card,codec {
/*
* Using dummy_codec to supports CVSD(8K) and mSBC(16K)
* for HFP.
*/
sound-dai = <&dummy_codec>;
};
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-pcm";
rockchip,mclk-fs = <128>;
rockchip,cpu = <&i2s_2ch_0>;
rockchip,codec = <&dummy_codec>;
rockchip,format = "dsp_b";
rockchip,bitclock-inversion = <0>;
rockchip,bitclock-master = <&dummy_codec>;
rockchip,frame-master = <&dummy_codec>;
rockchip,wait-card-locked = <0>;
};
spdif_tx_sound: spdif-tx-sound {

27
arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
View File

@@ -98,23 +98,16 @@
bluetooth_sound: bluetooth-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "dsp_b";
simple-audio-card,name = "rockchip,rk3308-pcm";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,bitclock-inversion = <0>;
simple-audio-card,bitclock-master = <&bt_codec>;
simple-audio-card,frame-master = <&bt_codec>;
simple-audio-card,cpu {
sound-dai = <&i2s_2ch_0>;
};
bt_codec: simple-audio-card,codec {
/*
* Using dummy_codec to supports CVSD(8K) and mSBC(16K)
* for HFP.
*/
sound-dai = <&dummy_codec>;
};
compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip,rk3308-pcm";
rockchip,mclk-fs = <128>;
rockchip,cpu = <&i2s_2ch_0>;
rockchip,codec = <&dummy_codec>;
rockchip,format = "dsp_b";
rockchip,bitclock-inversion = <0>;
rockchip,bitclock-master = <&dummy_codec>;
rockchip,frame-master = <&dummy_codec>;
rockchip,wait-card-locked = <0>;
};
spdif_tx_sound: spdif-tx-sound {