diff options
| author | mohit singh <mpsingh@nvidia.com> | 2011-03-01 11:19:35 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:53:30 -0700 |
| commit | 5b7c32894be75ae396fa8fd52475b2640f286f6b (patch) | |
| tree | fdc4ba57f1e524944abba09505804e3bf29b8ffd /drivers/video/tegra/dc/hdmi.c | |
| parent | d6ffa72fa39ed2911b568eaed35fdb9881be651a (diff) | |
arm: tegra: hdmi:audio freq and source selection
- moving the new API to a new file under mach tegra
include.
Original-Change-Id: I0e898883bbf5ab0f24573bb334ff355564118f2f
Reviewed-on: http://git-master/r/21206
Tested-by: Mohit Singh <mpsingh@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: I232974ba41e9b3589aebf6aa25a9ab17d4dd12dd
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
| -rw-r--r-- | drivers/video/tegra/dc/hdmi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c index ca477b0e5128..173f80d93bc4 100644 --- a/drivers/video/tegra/dc/hdmi.c +++ b/drivers/video/tegra/dc/hdmi.c @@ -31,6 +31,7 @@ #include <mach/dc.h> #include <mach/fb.h> #include <mach/nvhost.h> +#include <mach/hdmi-audio.h> #include <video/tegrafb.h> @@ -807,7 +808,6 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc) tegra_dc_set_outdata(dc, hdmi); dc_hdmi = hdmi; - /* boards can select default content protection policy */ if (dc->out->flags & TEGRA_DC_OUT_NVHDCP_POLICY_ON_DEMAND) { tegra_nvhdcp_set_policy(hdmi->nvhdcp, @@ -1048,7 +1048,7 @@ static int tegra_dc_hdmi_setup_audio(struct tegra_dc *dc, unsigned audio_freq, break; } - _tegra_hdmi_writel(hdmi, config->aval, reg_addr); + tegra_hdmi_writel(hdmi, config->aval, reg_addr); #endif tegra_dc_hdmi_setup_audio_fs_tables(dc); @@ -1337,10 +1337,11 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc) SOR_REFCLK_DIV_FRAC(dispclk_div_8_2), HDMI_NV_PDISP_SOR_REFCLK); - hdmi->clk_enabled = true; + if (!hdmi->dvi) { - err = tegra_dc_hdmi_setup_audio(dc); + err = tegra_dc_hdmi_setup_audio(dc, hdmi->audio_freq, + hdmi->audio_source); if (err < 0) hdmi->dvi = true; |