From: Yakir Yang <ykk@rock-chips.com>
Date: Thu, 28 Jul 2016 06:33:43 +0000 (+0800)
Subject: arm64: dts: rockchip: enable dw_hdmi audio support on EVB boards
X-Git-Tag: firefly_0821_release~2042
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9bdceb355aa2d13b8a1213d9dc8a35504a3b0a16;p=firefly-linux-kernel-4.4.55.git

arm64: dts: rockchip: enable dw_hdmi audio support on EVB boards

DRM dw_hdmi audio driver is based on common hdmi-codec driver, and bind
with i2s controller through simple-audio-card.

Change-Id: I2d9d5941b8e7c1f256e505338f43869584772e79
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts
index 9f3d17c8e5ee..aa89a924d9af 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts
@@ -60,6 +60,21 @@
 			};
 		};
 	};
+
+	hdmi_codec: hdmi-codec {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "HDMI-CODEC";
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+	};
 };
 
 &mipi_dsi {
@@ -90,6 +105,18 @@
 	};
 };
 
+&hdmi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&i2s2 {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
 &vopb {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts
index 45998cb6d8c1..5a7e865f3d4e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts
@@ -60,6 +60,21 @@
 			};
 		};
 	};
+
+	hdmi_codec: hdmi-codec {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "HDMI-CODEC";
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+	};
 };
 
 &mipi_dsi {
@@ -90,6 +105,18 @@
 	};
 };
 
+&hdmi {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
+&i2s2 {
+	#sound-dai-cells = <0>;
+	status = "okay";
+};
+
 &vopb {
 	status = "okay";
 };