diff options
| author | Dara Ramesh <dramesh@nvidia.com> | 2011-02-03 18:29:38 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:51:09 -0700 |
| commit | b861f86ff41f577e20cce985edc52bd8fb68cb07 (patch) | |
| tree | 82cd2eb092bc9711bf7012937cecd602e0199630 /sound | |
| parent | 7d03dd66da2eb69c417a1fa556b196c5d635df87 (diff) | |
arm: tegra: nvhdmi codec driver support
Adding nvhdmi codec driver support for tegra
Original-Change-Id: If4a71b74850c8684b62f059d24c28dd2f433789a
Reviewed-on: http://git-master/r/18187
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
Tested-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I27b51b0c88c2e173f42798a39d8c6eb8bbae89de
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/tegra/Makefile | 4 | ||||
| -rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sound/arm/tegra/Makefile b/sound/arm/tegra/Makefile index 570c6ed01aff..a0c5d4915faf 100644 --- a/sound/arm/tegra/Makefile +++ b/sound/arm/tegra/Makefile @@ -4,11 +4,13 @@ snd-hda-tegra-objs := ../../pci/hda/lib_hda_intel.o hda_tegra.o snd-hda-codec-y := ../../pci/hda/hda_codec.o snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += ../../pci/hda/hda_generic.o +snd-hda-codec-$(CONFIG_PROC_FS) += ../../pci/hda/hda_proc.o +snd-hda-codec-$(CONFIG_SND_HDA_ELD) += ../../pci/hda/hda_eld.o snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += ../../pci/hda/hda_hwdep.o snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += ../../pci/hda/hda_beep.o snd-hda-codec-$(CONFIG_PROC_FS) += ../../pci/hda/hda_proc.o -snd-hda-codec-nvhdmi-objs := patch_nvhdmi_tegra.o +snd-hda-codec-nvhdmi-objs := ../../pci/hda/patch_nvhdmi.o snd-hda-codec-realtek-objs := ../../pci/hda/patch_realtek.o diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index baa108b9d6aa..2c1e01a4b095 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -125,6 +125,11 @@ static int nvhdmi_init(struct hda_codec *codec) int i; if ((spec->codec_type == HDA_CODEC_NVIDIA_MCP89) || (spec->codec_type == HDA_CODEC_NVIDIA_GT21X)) { +#if defined(CONFIG_SND_HDA_TEGRA) + // AOC widget: SET_DIGITAL_CONV_CONTROL1 + snd_hda_codec_write(codec, 4, 0, + AC_VERB_SET_DIGI_CONVERT_1, 0x11); +#endif for (i = 0; spec->pin[i]; i++) { hdmi_enable_output(codec, spec->pin[i]); snd_hda_codec_write(codec, spec->pin[i], 0, @@ -549,6 +554,7 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, + { .id = 0x10de0020, .name = "Tegra HDMI", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, @@ -578,6 +584,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0019"); MODULE_ALIAS("snd-hda-codec-id:10de001a"); MODULE_ALIAS("snd-hda-codec-id:10de001b"); MODULE_ALIAS("snd-hda-codec-id:10de001c"); +MODULE_ALIAS("snd-hda-codec-id:10de0020"); MODULE_ALIAS("snd-hda-codec-id:10de0040"); MODULE_ALIAS("snd-hda-codec-id:10de0041"); MODULE_ALIAS("snd-hda-codec-id:10de0042"); |