summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx6/board-mx6q_arm2.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_arm2.c')
-rw-r--r--arch/arm/mach-mx6/board-mx6q_arm2.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
index 64cba5af1f08..98394c54d7d6 100644
--- a/arch/arm/mach-mx6/board-mx6q_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -53,6 +53,9 @@
#include <linux/regulator/fixed.h>
#include <linux/mfd/max17135.h>
#include <sound/pcm.h>
+#include <linux/mxc_asrc.h>
+#include <linux/mfd/mxc-hdmi-core.h>
+
#include <mach/common.h>
#include <mach/hardware.h>
@@ -1411,7 +1414,7 @@ static void hdmi_init(int ipu_id, int disp_id)
mxc_iomux_set_gpr_register(3, 2, 2, hdmi_mux_setting);
/* Set HDMI event as SDMA event2 while Chip version later than TO1.2 */
- if ((mx6q_revision() > IMX_CHIP_REVISION_1_1))
+ if (hdmi_SDMA_check())
mxc_iomux_set_gpr_register(0, 0, 1, 1);
}
@@ -1569,8 +1572,14 @@ static const struct pm_platform_data mx6_arm2_pm_data __initconst = {
.suspend_exit = arm2_suspend_exit,
};
+static const struct asrc_p2p_params esai_p2p __initconst = {
+ .p2p_rate = 44100,
+ .p2p_width = ASRC_WIDTH_24_BIT,
+};
+
static struct mxc_audio_platform_data sab_audio_data = {
.sysclk = 16934400,
+ .priv = (void *)&esai_p2p,
};
static struct platform_device sab_audio_device = {