Add the HDMI dai link to support audio for HDMi output
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen at st.com>
---
arch/arm/boot/dts/stih410.dtsi | 4 ++--
arch/arm/boot/dts/stihxxx-b2120.dtsi | 21 +++++++++++++++++++++
arch/arm/configs/multi_v7_defconfig | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 7ee7dc0..3881016 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -186,8 +186,9 @@
<&clk_s_d2_quadfs 0>;
};
- sti-hdmi at 8d04000 {
+ sti_hdmi: sti-hdmi at 8d04000 {
compatible = "st,stih407-hdmi";
+ #sound-dai-cells = <0>;
reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg";
interrupts = <GIC_SPI 106
IRQ_TYPE_NONE>;
@@ -210,7 +211,6 @@
reset-names = "hdmi";
resets = <&softreset
STIH407_HDMI_TX_PHY_SOFTRESET>;
ddc = <&hdmiddc>;
-
};
sti-hda at 8d02000 {
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi
b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index 3ad9c82..80fed19 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -81,6 +81,9 @@
audio_controller: sti-asoc-platform {
status = "okay";
};
+ sti_uni_player0: sti-uni-player at 0 {
+ status = "okay";
+ };
sti_uni_player2: sti-uni-player at 2 {
status = "okay";
};
@@ -93,6 +96,12 @@
sti_uni_reader1: sti-uni-reader at 1 {
status = "okay";
};
+
+ sti-display-subsystem {
+ sti_hdmi: sti-hdmi at 8d04000 {
+ status = "okay";
+ };
+ };
};
sound {
@@ -125,6 +134,18 @@
sound-dai = <&sti_sasg_codec 0>;
};
};
+ simple-audio-card,dai-link at 2 {
+ /* HDMI */
+ format = "i2s";
+ mclk-fs = <128>;
+ cpu {
+ sound-dai = <&sti_uni_player0>;
+ };
+
+ codec {
+ sound-dai = <&sti_hdmi>;
+ };
+ };
};
};
diff --git a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index 2a44694..6f43666 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -461,6 +461,7 @@ CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_ATMEL_SOC_WM8904=m
CONFIG_SND_SOC_SH4_FSI=m
CONFIG_SND_SOC_RCAR=m
+CONFIG_SND_SOC_HDMI_DRM_CODEC=y
CONFIG_SND_SOC_STI=y
CONFIG_SND_SOC_STI_SAS=y
CONFIG_SND_SOC_TEGRA=m
--
1.9.1
