From 2914f876af24fb30f5f5e9b7005b06f2102c3331 Mon Sep 17 00:00:00 2001 From: Jacob Chen Date: Fri, 15 Jul 2016 09:39:29 +0800 Subject: [PATCH] ARM: dts: rockchip: merge the hdmi-audio card with rt5616-codec card Change-Id: I2888cbb7df9d4cd9d270f7fd81f34b27b40997cc Signed-off-by: Yakir Yang Signed-off-by: Jacob Chen --- arch/arm/boot/dts/rk3036-kylin.dts | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index f0943cbf6bfe..829de04ad104 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -94,12 +94,26 @@ "Headphone Jack", "HPOL", "Headphone Jack", "HPOR"; - simple-audio-card,cpu { - sound-dai = <&i2s>; + simple-audio-card,dai-link@0 { + format = "i2s"; + cpu { + sound-dai = <&i2s>; + }; + + codec { + sound-dai = <&rt5616>; + }; }; - simple-audio-card,codec { - sound-dai = <&rt5616>; + simple-audio-card,dai-link@1 { + format = "i2s"; + cpu { + sound-dai = <&i2s>; + }; + + codec { + sound-dai = <&hdmi>; + }; }; }; @@ -139,10 +153,6 @@ status = "okay"; }; -&hdmi_sound { - status = "okay"; -}; - &i2c1 { clock-frequency = <400000>; -- 2.34.1