arm64: dts: rockchip: disabled the dw-hdmi-audio by default for Sapphire board

The dw-hdmi-audio driver could only work on FB dw-hdmi driver, we can't
use it on DRM display sub-system. So I think it's better to disable the
dw-hdmi-audio by default for Sapphire board, but enable this device node
for excavator-edp and excavator-box boards.

Change-Id: I8c2639d535510f1092a3da02e008986394608998
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
index 20796db557804ab09c41f393447ad87fb3226fc1..05ffd4aff5a3bd68589f06352f42a572a4321568 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
@@ -58,6 +58,10 @@
        native-mode = <&timing1>; /* 1080p */
 };
 
+&dw_hdmi_audio {
+       status = "okay";
+};
+
 &fb {
        rockchip,disp-mode = <NO_DUAL>;
        rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
@@ -68,6 +72,10 @@
        rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC0>;
 };
 
+&hdmi_sound {
+       status = "okay";
+};
+
 &pwm3 {
        status = "okay";
        interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH 0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
index 05eb9f955450814320c89f976e43f90f70fe5809..654edae53605977c1808947469226ee04f522339 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
@@ -54,6 +54,10 @@
        status = "okay";
 };
 
+&dw_hdmi_audio {
+       status = "okay";
+};
+
 &edp_rk_fb {
        status = "okay";
 };
@@ -63,6 +67,10 @@
        rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
 
+&hdmi_sound {
+       status = "okay";
+};
+
 &i2c1 {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 1f2fdd14387818403795d296655720c360d000eb..f1d920118c7367867b72f1b4825493f5baa83baf 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -94,13 +94,13 @@
        };
 
        dw_hdmi_audio: dw-hdmi-audio {
-               status = "okay";
+               status = "disabled";
                compatible = "rockchip,dw-hdmi-audio";
                #sound-dai-cells = <0>;
        };
 
        hdmi_sound: hdmi-sound {
-               status = "okay";
+               status = "disabled";
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
                simple-audio-card,mclk-fs = <256>;