ARM: dts: rockchip: merge the hdmi-audio card with rt5616-codec card

Change-Id: I2888cbb7df9d4cd9d270f7fd81f34b27b40997cc
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index f0943cbf6bfe610280c990379b524c9e45f29349..829de04ad104e6747c7b5369593952e34e247b40 100644 (file)
--- 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>;