The MCLK mode defines a factor to divide the clock that is used to
generate the Audio Clock Regeneration packets, MCLK.

The divisor is not used when the CTS value is calculated by HW.
When the value is calculated by SW, it depends on the silicon
revision.

Signed-off-by: Ricardo Neri <[email protected]>
---
 drivers/video/omap2/dss/hdmi.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index b4c270e..04c83c8 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -692,13 +692,15 @@ static int hdmi_audio_hw_params(struct snd_pcm_substream 
*substream,
        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 = false;
+               core_cfg.use_mclk = dss_has_feature(FEAT_HDMI_AUDIO_USE_MCLK);
        } else {
                core_cfg.aud_par_busclk = (((128 * 31) - 1) << 8);
                core_cfg.cts_mode = HDMI_AUDIO_CTS_MODE_HW;
                core_cfg.use_mclk = true;
-               core_cfg.mclk_mode = HDMI_AUDIO_MCLK_128FS;
        }
+
+       if (core_cfg.use_mclk)
+               core_cfg.mclk_mode = HDMI_AUDIO_MCLK_128FS;
        core_cfg.layout = HDMI_AUDIO_LAYOUT_2CH;
        core_cfg.en_spdif = false;
        /* Use sample frequency from channel status word */
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to