diff options
| author | Axel Castaneda Gonzalez <x0055901@ti.com> | 2012-02-03 16:28:21 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-20 07:14:06 -0600 |
| commit | 00906e74e0eb90b8d48754258c2d0e01d09800f8 (patch) | |
| tree | 4d52ea658040246ec2968ba7ea2bfe065c7e7369 /sound/soc | |
| parent | d0c8443c8fc9c0e550474ceffd2184a8bb1deb16 (diff) | |
| download | kernel_samsung_espresso10-00906e74e0eb90b8d48754258c2d0e01d09800f8.zip kernel_samsung_espresso10-00906e74e0eb90b8d48754258c2d0e01d09800f8.tar.gz kernel_samsung_espresso10-00906e74e0eb90b8d48754258c2d0e01d09800f8.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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/omap-hdmi-codec.c | 6 |
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 1683e17..13710c8 100644 --- a/sound/soc/codecs/omap-hdmi-codec.c +++ b/sound/soc/codecs/omap-hdmi-codec.c @@ -80,6 +80,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: @@ -167,7 +171,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; |