summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx6/board-mx6q_sabreauto.c
diff options
context:
space:
mode:
authorAlan Tull <alan.tull@freescale.com>2011-09-15 15:51:33 -0500
committerJason Liu <r64343@freescale.com>2012-01-09 21:03:15 +0800
commit495116168d8cbd4312c0902391e6d09c3c2eb681 (patch)
treeccf1f403de7078bae95ea22177677e85d150d82c /arch/arm/mach-mx6/board-mx6q_sabreauto.c
parent5d422a604fd113285b43d860fd07b0818f5e86b7 (diff)
ENGR00160860-1 hdmi audio driver
Audio driver for i.Mx built-in HDMI Transmitter. * Uses HDMI Transmitter's built-in DMA. * Adds IEC958-style digital audio header info to the raw audio. * Gets pixel clock from the IPU driver and calculates clock regenerator values (cts and N). * Move ipu_id, and disp_id from the HDMI's platform data to the HDMI mfd's platform data. Saves them in the hdmi mfd. Signed-off-by: Alan Tull <alan.tull@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabreauto.c')
-rw-r--r--arch/arm/mach-mx6/board-mx6q_sabreauto.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
index 7ef2be92f06f..5f76cbc3a18e 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
@@ -767,6 +767,9 @@ static void hdmi_init(int ipu_id, int disp_id)
static struct fsl_mxc_hdmi_platform_data hdmi_data = {
.init = hdmi_init,
+};
+
+static struct fsl_mxc_hdmi_core_platform_data hdmi_core_data = {
.ipu_id = 0,
.disp_id = 0,
};
@@ -942,7 +945,7 @@ static void __init mx6_board_init(void)
ARRAY_SIZE(mx6q_sabreauto_esai_record_pads));
mx6q_sabreauto_init_uart();
- imx6q_add_mxc_hdmi_core();
+ imx6q_add_mxc_hdmi_core(&hdmi_core_data);
imx6q_add_ipuv3(0, &ipu_data[0]);
imx6q_add_ipuv3(1, &ipu_data[1]);
@@ -1018,6 +1021,9 @@ static void __init mx6_board_init(void)
imx6q_add_spdif(&mxc_spdif_data);
imx6q_add_spdif_dai();
imx6q_add_spdif_audio_device();
+
+ imx6q_add_hdmi_soc();
+ imx6q_add_hdmi_soc_dai();
}
extern void __iomem *twd_base;