ALSA: Support NVIDIA MCP78/7A HDMI audio (9a10eb21) · Commits · e / devices / android_kernel_fairphone_FP3

sound/pci/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -565,6 +565,14 @@ config SND_HDA_CODEC_ATIHDMI
		Say Y here to include ATI HDMI HD-audio codec support in
		snd-hda-intel driver, such as ATI RS600 HDMI.

		config SND_HDA_CODEC_NVHDMI
		bool "Build NVIDIA HDMI HD-audio codec support"
		depends on SND_HDA_INTEL
		default y
		help
		Say Y here to include NVIDIA HDMI HD-audio codec support in
		snd-hda-intel driver, such as NVIDIA MCP78 HDMI.

		config SND_HDA_CODEC_CONEXANT
		bool "Build Conexant HD-audio codec support"
		depends on SND_HDA_INTEL

sound/pci/hda/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,5 +15,6 @@ snd-hda-intel-$(CONFIG_SND_HDA_CODEC_SI3054) += patch_si3054.o
		snd-hda-intel-$(CONFIG_SND_HDA_CODEC_ATIHDMI) += patch_atihdmi.o
		snd-hda-intel-$(CONFIG_SND_HDA_CODEC_CONEXANT) += patch_conexant.o
		snd-hda-intel-$(CONFIG_SND_HDA_CODEC_VIA) += patch_via.o
		snd-hda-intel-$(CONFIG_SND_HDA_CODEC_NVHDMI) += patch_nvhdmi.o

		obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-intel.o

sound/pci/hda/hda_codec.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,9 @@ static const struct hda_codec_preset *hda_preset_tables[] = {
		#endif
		#ifdef CONFIG_SND_HDA_CODEC_VIA
		snd_hda_preset_via,
		#endif
		#ifdef CONFIG_SND_HDA_CODEC_NVHDMI
		snd_hda_preset_nvhdmi,
		#endif
		NULL
		};

sound/pci/hda/hda_patch.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,3 +18,5 @@ extern struct hda_codec_preset snd_hda_preset_atihdmi[];
		extern struct hda_codec_preset snd_hda_preset_conexant[];
		/* VIA codecs */
		extern struct hda_codec_preset snd_hda_preset_via[];
		/* NVIDIA HDMI codecs */
		extern struct hda_codec_preset snd_hda_preset_nvhdmi[];

sound/pci/hda/patch_nvhdmi.c

0 → 100644

+164 −0

Original line number	Diff line number	Diff line
		/*
		* Universal Interface for Intel High Definition Audio Codec
		*
		* HD audio interface patch for NVIDIA HDMI codecs
		*
		* Copyright (c) 2008 NVIDIA Corp. All rights reserved.
		* Copyright (c) 2008 Wei Ni <wni@nvidia.com>
		*
		*
		* This driver is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This driver is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/slab.h>
		#include <sound/core.h>
		#include "hda_codec.h"
		#include "hda_local.h"

		struct nvhdmi_spec {
		struct hda_multi_out multiout;

		struct hda_pcm pcm_rec;
		};

		static struct hda_verb nvhdmi_basic_init[] = {
		/* enable digital output on pin widget */
		{ 0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
		{} /* terminator */
		};

		/*
		* Controls
		*/
		static int nvhdmi_build_controls(struct hda_codec *codec)
		{
		struct nvhdmi_spec *spec = codec->spec;
		int err;

		err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
		if (err < 0)
		return err;

		return 0;
		}

		static int nvhdmi_init(struct hda_codec *codec)
		{
		snd_hda_sequence_write(codec, nvhdmi_basic_init);
		return 0;
		}

		/*
		* Digital out
		*/
		static int nvhdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
		struct hda_codec *codec,
		struct snd_pcm_substream *substream)
		{
		struct nvhdmi_spec *spec = codec->spec;
		return snd_hda_multi_out_dig_open(codec, &spec->multiout);
		}

		static int nvhdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
		struct hda_codec *codec,
		struct snd_pcm_substream *substream)
		{
		struct nvhdmi_spec *spec = codec->spec;
		return snd_hda_multi_out_dig_close(codec, &spec->multiout);
		}

		static int nvhdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
		struct hda_codec *codec,
		unsigned int stream_tag,
		unsigned int format,
		struct snd_pcm_substream *substream)
		{
		struct nvhdmi_spec *spec = codec->spec;
		return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
		format, substream);
		}

		static struct hda_pcm_stream nvhdmi_pcm_digital_playback = {
		.substreams = 1,
		.channels_min = 2,
		.channels_max = 2,
		.nid = 0x4, /* NID to query formats and rates and setup streams */
		.rates = SNDRV_PCM_RATE_48000,
		.maxbps = 16,
		.formats = SNDRV_PCM_FMTBIT_S16_LE,
		.ops = {
		.open = nvhdmi_dig_playback_pcm_open,
		.close = nvhdmi_dig_playback_pcm_close,
		.prepare = nvhdmi_dig_playback_pcm_prepare
		},
		};

		static int nvhdmi_build_pcms(struct hda_codec *codec)
		{
		struct nvhdmi_spec *spec = codec->spec;
		struct hda_pcm *info = &spec->pcm_rec;

		codec->num_pcms = 1;
		codec->pcm_info = info;

		info->name = "NVIDIA HDMI";
		info->stream[SNDRV_PCM_STREAM_PLAYBACK] = nvhdmi_pcm_digital_playback;

		return 0;
		}

		static void nvhdmi_free(struct hda_codec *codec)
		{
		kfree(codec->spec);
		}

		static struct hda_codec_ops nvhdmi_patch_ops = {
		.build_controls = nvhdmi_build_controls,
		.build_pcms = nvhdmi_build_pcms,
		.init = nvhdmi_init,
		.free = nvhdmi_free,
		};

		static int patch_nvhdmi(struct hda_codec *codec)
		{
		struct nvhdmi_spec *spec;

		spec = kzalloc(sizeof(*spec), GFP_KERNEL);
		if (spec == NULL)
		return -ENOMEM;

		codec->spec = spec;

		spec->multiout.num_dacs = 0; /* no analog */
		spec->multiout.max_channels = 2;
		spec->multiout.dig_out_nid = 0x4; /* NID for copying analog to digital,
		* seems to be unused in pure-digital
		* case. */

		codec->patch_ops = nvhdmi_patch_ops;

		return 0;
		}

		/*
		* patch entries
		*/
		struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
		{ .id = 0x10de0002, .name = "NVIDIA MCP78 HDMI", .patch = patch_nvhdmi },
		{ .id = 0x10de0007, .name = "NVIDIA MCP7A HDMI", .patch = patch_nvhdmi },
		{} /* terminator */
		};