From 304ba59de2ff55c3fa860d55e4ac4ea4d1132e05 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Fri, 29 Mar 2019 12:27:06 +0800 Subject: [PATCH] arm64: dts: rockchip: change the order for sound card on rk3399pro evb 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: 313c342e9aff ("arm64: dts: rockchip: add hdmi-sound for rk3399pro evb board") Change-Id: Ia14f5703f6b79795cd7504fa35a23a550178b82f Signed-off-by: Caesar Wang --- .../dts/rockchip/rk3399pro-evb-v10-linux.dts | 30 +++++++++---------- .../boot/dts/rockchip/rk3399pro-evb-v10.dts | 30 +++++++++---------- .../dts/rockchip/rk3399pro-evb-v11-linux.dts | 30 +++++++++---------- .../boot/dts/rockchip/rk3399pro-evb-v11.dts | 30 +++++++++---------- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts index e8a239300137..3624158c3440 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10-linux.dts @@ -113,21 +113,6 @@ interrupts = ; }; - 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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts index 3f1eec031ad9..3aaa37689921 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v10.dts @@ -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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts index 9a620fba3729..9d6cbc2c057f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11-linux.dts @@ -113,21 +113,6 @@ interrupts = ; }; - 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>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts index 9d801aba83ac..712508ec2341 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-evb-v11.dts @@ -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>;