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

arm64: dts: rockchip: sound collation on rk3399-sapphire-excavator board

Browse Source 
The original order of sound cards registration were really messy......

The hdmi is the first sound card by default.
for linux:
[    1.870252] ALSA device list:
[    1.871548]   #0: rockchip,hdmi
[    1.871863]   #1: realtek,rt5651-codec
[    1.872248]   #2: ROCKCHIP,SPDIF

Then after adding this patch,   the sound cards as below:
[    1.863328] ALSA device list:
[    1.863601]   #0: realtek,rt5651-codec
[    1.863942]   #1: rockchip,hdmi
[    1.864236]   #2: ROCKCHIP,SPDIF

Change-Id: I884df2752e84d95dbddba9b23c7dbd778ffb9357
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
This commit is contained in:
Caesar Wang
2019-06-12 16:02:22 +08:00
parent ee4161d2fd
commit 0d2ae680e6
3 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi
View File

@@ -70,6 +70,7 @@
};
rt5651-sound {
status = "okay";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "realtek,rt5651-codec";
@@ -90,6 +91,34 @@
};
};
dw_hdmi_audio: dw-hdmi-audio {
status = "disabled";
compatible = "rockchip,dw-hdmi-audio";
#sound-dai-cells = <0>;
};
dp_sound: dp-sound {
status = "disabled";
compatible = "rockchip,cdndp-sound";
rockchip,cpu = <&spdif>;
rockchip,codec = <&cdn_dp 1>;
};
hdmi_sound: hdmi-sound {
status = "okay";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,name = "rockchip,hdmi";
simple-audio-card,cpu {
sound-dai = <&i2s2>;
};
simple-audio-card,codec {
sound-dai = <&hdmi>;
};
};
spdif-sound {
status = "okay";
compatible = "simple-audio-card";

4
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts
View File

@@ -157,10 +157,6 @@
};
};
hdmi_sound: hdmi-sound {
status = "okay";
};
ext_cam_clk: external-camera-clock {
compatible = "fixed-clock";
clock-frequency = <27000000>;

28
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@@ -94,34 +94,6 @@
#clock-cells = <0>;
};
dw_hdmi_audio: dw-hdmi-audio {
status = "disabled";
compatible = "rockchip,dw-hdmi-audio";
#sound-dai-cells = <0>;
};
dp_sound: dp-sound {
status = "disabled";
compatible = "rockchip,cdndp-sound";
rockchip,cpu = <&spdif>;
rockchip,codec = <&cdn_dp 1>;
};
hdmi_sound: hdmi-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,name = "rockchip,hdmi";
simple-audio-card,cpu {
sound-dai = <&i2s2>;
};
simple-audio-card,codec {
sound-dai = <&hdmi>;
};
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk808 1>;