aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Castaneda Gonzalez <x0055901@ti.com>2012-02-03 16:28:21 -0600
committerZiyann <jaraidaniel@gmail.com>2014-10-01 12:56:38 +0200
commit214e7ec429f4fe8d587fdafca1f1553fa8afa6e1 (patch)
tree0355b3407be5a7b0f62387cd6a0fbd1d786de552
parentac6c52707f02b9cb289aad58ef6376aee3157c01 (diff)
downloadkernel_samsung_tuna-214e7ec429f4fe8d587fdafca1f1553fa8afa6e1.zip
kernel_samsung_tuna-214e7ec429f4fe8d587fdafca1f1553fa8afa6e1.tar.gz
kernel_samsung_tuna-214e7ec429f4fe8d587fdafca1f1553fa8afa6e1.tar.bz2
ASoC: OMAP: HDMI: Use generated audio MCLK for OMAP4430 ES 2.3
For OMAP4430 ES2.3, use pseudo generated clock (MCLK- based on TMDS clock) to form Audio Clock Regeneration (ACR) packets. MCLK is also used for OMAP4460 and later chip versions. Change-Id: I65f255cb7eac39bbbb52b2f0105f6721f0f08df7 Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
-rw-r--r--sound/soc/codecs/omap-hdmi-codec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/omap-hdmi-codec.c b/sound/soc/codecs/omap-hdmi-codec.c
index cf9edd2..c46a5f5 100644
--- a/sound/soc/codecs/omap-hdmi-codec.c
+++ b/sound/soc/codecs/omap-hdmi-codec.c
@@ -82,6 +82,10 @@ static int hdmi_audio_set_configuration(struct hdmi_codec_data *priv)
int err, n, cts, channel_alloc;
enum hdmi_core_audio_sample_freq sample_freq;
u32 pclk = omapdss_hdmi_get_pixel_clock();
+ struct omap_chip_id audio_must_use_mclk;
+
+ audio_must_use_mclk.oc = CHIP_IS_OMAP4430ES2_3 | CHIP_IS_OMAP446X |
+ CHIP_IS_OMAP447X;
switch (priv->params.format) {
case SNDRV_PCM_FORMAT_S16_LE:
@@ -169,7 +173,7 @@ static int hdmi_audio_set_configuration(struct hdmi_codec_data *priv)
if (dss_has_feature(FEAT_HDMI_CTS_SWMODE)) {
core_cfg->aud_par_busclk = 0;
core_cfg->cts_mode = HDMI_AUDIO_CTS_MODE_SW;
- core_cfg->use_mclk = (cpu_is_omap446x() || cpu_is_omap447x());
+ core_cfg->use_mclk = omap_chip_is(audio_must_use_mclk);
} else {
core_cfg->aud_par_busclk = (((128 * 31) - 1) << 8);
core_cfg->cts_mode = HDMI_AUDIO_CTS_MODE_HW;