ARM64: dts: rk3399-android: disable hdmi sound default

Change-Id: I9d6bbbfc336f7e7028dfa937b4a34b2d1b5ed7ee
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index fdf4f9f4b24175a344a2c758d80b566cb8c3d620..e433209f0bd7c482f4e9e44344b0d3b130138409 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -338,7 +338,8 @@
                status = "disabled";
        };
 
-       hdmi-sound {
+       hdmi_sound: hdmi-sound {
+               status = "disabled";
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
                simple-audio-card,mclk-fs = <256>;
@@ -352,13 +353,13 @@
        };
 
        dw_hdmi_audio: dw-hdmi-audio {
+               status = "disabled";
                compatible = "rockchip,dw-hdmi-audio";
                #sound-dai-cells = <0>;
        };
 };
 
 &i2s2 {
-       status = "okay";
        #sound-dai-cells = <0>;
 };
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
index 19d5dc5b7caa582126139775f4f85978db0ff5ea..70e3522c2b09557c3020a5da5e14702dac56feb8 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
@@ -97,3 +97,15 @@
        status = "okay";
        rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
+
+&i2s2 {
+       status = "okay";
+};
+
+&dw_hdmi_audio {
+       status = "okay";
+};
+
+&hdmi_sound {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
index ffb24ae9abecc175cec27cb48e977a1fbdddabd2..0290759f2ee916c4287226e5643701ad7517cb48 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
@@ -92,3 +92,15 @@
        status = "okay";
        rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC1>;
 };
+
+&i2s2 {
+       status = "okay";
+};
+
+&dw_hdmi_audio {
+       status = "okay";
+};
+
+&hdmi_sound {
+       status = "okay";
+};