diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2019-06-12 16:02:22 +0800 |
|---|---|---|
| committer | Caesar Wang <wxt@rock-chips.com> | 2019-06-12 16:12:18 +0800 |
| commit | 0d2ae680e606383937eceab78e04e802117510b4 (patch) | |
| tree | ef085201aa6f370a34e107832fe54e85656774a1 /arch | |
| parent | ee4161d2fd867e5759fa4f332967d0b37cf5728e (diff) | |
arm64: dts: rockchip: sound collation on rk3399-sapphire-excavator board
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>
Diffstat (limited to 'arch')
3 files changed, 29 insertions, 32 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi index cb8292e40607..9b19576a7d43 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-excavator-sapphire.dtsi @@ -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"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts index f474e3b255d6..ecd40b1e02b6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-linux.dts @@ -157,10 +157,6 @@ }; }; - hdmi_sound: hdmi-sound { - status = "okay"; - }; - ext_cam_clk: external-camera-clock { compatible = "fixed-clock"; clock-frequency = <27000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 7babf3b6045a..fc0e9f029e5d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -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>; |