From 7c9600125b0c0d841526e562efc54fb6fbf7d627 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Wed, 15 Feb 2017 16:32:55 +0800 Subject: [PATCH] arm64: dts: rk3399-box-next: using drm hdmi audio framework Change-Id: Ia217fdb6c9f8e77079ff5e5683d277fda6aeab5b Signed-off-by: Sugar Zhang --- arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi | 3 +++ arch/arm64/boot/dts/rockchip/rk3399-box-next.dtsi | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi index de6edb122696..956c3c6a15e2 100644 --- 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 02d7aa87c1d8..abcab029ab55 100644 --- 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>; -- 2.34.1