diff options
| author | Erik Gilling <konkers@android.com> | 2010-12-13 21:11:04 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2010-12-13 21:11:27 -0800 |
| commit | 7b1d94e54b49c415f4456de23ae1492838a2d042 (patch) | |
| tree | 3e400e96ae71dc2b731fdf8d2128cde20fbe96b2 /drivers/video/tegra/dc/hdmi.c | |
| parent | 42907f1736fe39cdf39b5f583fcd6b9e4e257b18 (diff) | |
| parent | 67c58dfc7038e9fd360b148caa63fe31b0a0abc5 (diff) | |
Merge remote branch linux-tegra-2.6.36 into android-tegra
Change-Id: I90cac044708a1b51ed15374b20709180ed92270a
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index 7e19466d3775..006529d78101 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -698,7 +698,7 @@ static int tegra_dc_hdmi_setup_audio(struct tegra_dc *dc) unsigned audio_freq = 44100; /* TODO: find some way of configuring this */ tegra_hdmi_writel(hdmi, - AUDIO_CNTRL0_ERROR_TOLERANCE(9) | + AUDIO_CNTRL0_ERROR_TOLERANCE(6) | AUDIO_CNTRL0_FRAMES_PER_BLOCK(0xc0) | AUDIO_CNTRL0_SOURCE_SELECT_AUTO, HDMI_NV_PDISP_AUDIO_CNTRL0); @@ -714,7 +714,7 @@ static int tegra_dc_hdmi_setup_audio(struct tegra_dc *dc) tegra_hdmi_writel(hdmi, 0, HDMI_NV_PDISP_HDMI_ACR_CTRL); audio_n = AUDIO_N_RESETF | AUDIO_N_GENERATE_ALTERNALTE | - AUDIO_N_VALUE(config->n); + AUDIO_N_VALUE(config->n - 1); tegra_hdmi_writel(hdmi, audio_n, HDMI_NV_PDISP_AUDIO_N); tegra_hdmi_writel(hdmi, ACR_SUBPACK_N(config->n) | ACR_ENABLE, |