From fc32f29ef6d369683dd4dbda0074d325060108cf Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Sun, 12 Jun 2016 15:35:21 +0800 Subject: [PATCH] ARM64: dts: rk3399-android: disable hdmi sound default Change-Id: I9d6bbbfc336f7e7028dfa937b4a34b2d1b5ed7ee Signed-off-by: Sugar Zhang --- arch/arm64/boot/dts/rockchip/rk3399-android.dtsi | 5 +++-- .../boot/dts/rockchip/rk3399-evb-rev1-android.dts | 12 ++++++++++++ .../boot/dts/rockchip/rk3399-evb-rev2-android.dts | 12 ++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index fdf4f9f4b241..e433209f0bd7 100644 --- 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 19d5dc5b7caa..70e3522c2b09 100644 --- 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 = ; }; + +&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 ffb24ae9abec..0290759f2ee9 100644 --- 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 = ; }; + +&i2s2 { + status = "okay"; +}; + +&dw_hdmi_audio { + status = "okay"; +}; + +&hdmi_sound { + status = "okay"; +}; -- 2.34.1