arm64: dts: rk3399-box-next: using drm hdmi audio framework

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
index de6edb122696024924a2cc9383f77a4258d71aab..956c3c6a15e26c78fef4a107c0e622b4f36d3666 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
@@ -259,6 +259,9 @@
 };
 
 &hdmi {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       #sound-dai-cells = <0>;
        ddc-i2c-bus = <&i2c3>;
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box-next.dtsi
index 02d7aa87c1d8733b4aec39ea9befee40b6b589d5..abcab029ab55d4f1e54718b795991722504df0b4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-next.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-next.dtsi
@@ -141,16 +141,10 @@
                        sound-dai = <&i2s2>;
                };
                simple-audio-card,codec {
-                       sound-dai = <&dw_hdmi_audio>;
+                       sound-dai = <&hdmi>;
                };
        };
 
-       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>;