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

arm64: dts: rockchip: change the order for sound card on rk3399pro evb

Browse Source 
Change the order in which the sound card is used. The rk809 sound card is
used by default for card0.

This will keep the status on original, and just add the hdmi sound card
for rk3399pro evb board.

Says the cards order as below.
[root@rk3399pro:/]# cat /proc/asound/cards
 0 [rockchiprk809co]: rockchip_rk809- - rockchip,rk809-codec
                      rockchip,rk809-codec
 1 [rockchiphdmi   ]: rockchip_hdmi - rockchip,hdmi
                      rockchip,hdmi

Fixes: 313c342e9a
("arm64: dts: rockchip: add hdmi-sound for rk3399pro evb board")

Change-Id: Ia14f5703f6b79795cd7504fa35a23a550178b82f
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
This commit is contained in:
Caesar Wang
2019-03-29 12:27:06 +08:00
committed by Tao Huang
parent 1b2e6aadd9
commit 304ba59de2
4 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts
View File

@@ -113,21 +113,6 @@
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH 0>;
};
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>;
};
};
panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
@@ -184,6 +169,21 @@
};
};
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>;
};
};
rk_headset {
compatible = "rockchip_headset";
headset_gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;

30
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts
View File

@@ -102,21 +102,6 @@
#clock-cells = <0>;
};
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>;
};
};
panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
@@ -173,6 +158,21 @@
};
};
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>;
};
};
rk_headset {
compatible = "rockchip_headset";
headset_gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;

30
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts
View File

@@ -113,21 +113,6 @@
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH 0>;
};
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>;
};
};
panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
@@ -184,6 +169,21 @@
};
};
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>;
};
};
rk_headset {
compatible = "rockchip_headset";
headset_gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;

30
arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts
View File

@@ -103,21 +103,6 @@
#clock-cells = <0>;
};
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>;
};
};
panel: panel {
compatible = "simple-panel";
backlight = <&backlight>;
@@ -174,6 +159,21 @@
};
};
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>;
};
};
rk_headset {
compatible = "rockchip_headset";
headset_gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;