ARM64: dts: rk3399: move hdmi-sound nodes to rk3399-evb.dtsi

Change-Id: I63f1c8b6c2bbdcb78ec6f5324f6b02105063832a
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index 9eb8a296c31511d852f74ff7d3c6fe1d6a070a71..eefcbfa7f66e8a70d894a481681ef08c09a03885 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
@@ -458,26 +458,6 @@
                reset-names = "edp_apb";
                status = "disabled";
        };
-
-       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 = <&dw_hdmi_audio>;
-               };
-       };
-
-       dw_hdmi_audio: dw-hdmi-audio {
-               status = "disabled";
-               compatible = "rockchip,dw-hdmi-audio";
-               #sound-dai-cells = <0>;
-       };
 };
 
 &usbdrd_dwc3_0 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
index f19532945a26a171c1dc2ae8c15813fb6f0cfc98..f9de243ba7bf0c1ccf3f8d51b45b9d40365471dc 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
@@ -141,6 +141,26 @@
                #sound-dai-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 = <&dw_hdmi_audio>;
+               };
+       };
+
+       dw_hdmi_audio: dw-hdmi-audio {
+               status = "okay";
+               compatible = "rockchip,dw-hdmi-audio";
+               #sound-dai-cells = <0>;
+       };
+
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 1>;
@@ -734,10 +754,3 @@
        status = "okay";
 };
 
-&dw_hdmi_audio {
-       status = "okay";
-};
-
-&hdmi_sound {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index 88e92792607a226f5137e68370077f54bb6cef8f..98e45e2b2ff7dc84526813c3b3c0e0b4bc9242b1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -157,6 +157,26 @@
                };
        };
 
+       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 = <&dw_hdmi_audio>;
+               };
+       };
+
+       dw_hdmi_audio: dw-hdmi-audio {
+               status = "disabled";
+               compatible = "rockchip,dw-hdmi-audio";
+               #sound-dai-cells = <0>;
+       };
+
        spdif_sound: spdif-sound {
                status = "disabled";
                compatible = "simple-audio-card";