From: Tomeu Vizoso <tomeu.vizoso@collabora.com> To: linux-kernel@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com>, alsa-devel@alsa-project.org, Wolfram Sang <wsa@the-dreams.de>, Andrew Bresticker <abrestic@chromium.org>, Thierry Reding <thierry.reding@gmail.com>, Alexandre Courbot <gnurou@gmail.com>, Lars-Peter Clausen <lars@metafoo.de>, Stephen Warren <swarren@wwwdotorg.org>, Takashi Iwai <tiwai@suse.de>, Dylan Reid <dgreid@chromium.org>, devicetree@vger.kernel.org, Pawel Moll <pawel.moll@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Rob Herring <robh+dt@kernel.org>, linux-tegra@vger.kernel.org, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Simon Glass <sjg@chromium.org>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Kumar Gala <galak@codeaurora.org>, Javier Martinez Canillas <javier.martinez@collabora.co.uk> Subject: [PATCH v3 07/10] ASoC: tegra: add sink for the internal mic to tegra_max98090 Date: Wed, 28 Jan 2015 11:51:05 +0100 [thread overview] Message-ID: <1422442278-10405-8-git-send-email-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <1422442278-10405-1-git-send-email-tomeu.vizoso@collabora.com> This is used in the Tegra-based Chromebooks. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> --- Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + sound/soc/tegra/tegra_max98090.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt index c949abc..c3495be 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt @@ -18,6 +18,7 @@ Required properties: * Headphones * Speakers * Mic Jack + * Int Mic - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's connected to the CODEC. diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 8df71a4..29ea87c 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -133,11 +133,13 @@ static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphones", NULL), SND_SOC_DAPM_SPK("Speakers", NULL), SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), }; static const struct snd_kcontrol_new tegra_max98090_controls[] = { SOC_DAPM_PIN_SWITCH("Headphones"), SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Int Mic"), }; static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) -- 1.9.3
WARNING: multiple messages have this Message-ID (diff)
From: Tomeu Vizoso <tomeu.vizoso@collabora.com> To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>, Dylan Reid <dgreid@chromium.org>, Andrew Bresticker <abrestic@chromium.org>, Simon Glass <sjg@chromium.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Stephen Warren <swarren@wwwdotorg.org>, Thierry Reding <thierry.reding@gmail.com>, Alexandre Courbot <gnurou@gmail.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>, Wolfram Sang <wsa@the-dreams.de>, Lars-Peter Clausen <lars@metafoo.de>, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3 07/10] ASoC: tegra: add sink for the internal mic to tegra_max98090 Date: Wed, 28 Jan 2015 11:51:05 +0100 [thread overview] Message-ID: <1422442278-10405-8-git-send-email-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <1422442278-10405-1-git-send-email-tomeu.vizoso@collabora.com> This is used in the Tegra-based Chromebooks. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> --- Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt | 1 + sound/soc/tegra/tegra_max98090.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt index c949abc..c3495be 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt @@ -18,6 +18,7 @@ Required properties: * Headphones * Speakers * Mic Jack + * Int Mic - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's connected to the CODEC. diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 8df71a4..29ea87c 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c @@ -133,11 +133,13 @@ static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphones", NULL), SND_SOC_DAPM_SPK("Speakers", NULL), SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), }; static const struct snd_kcontrol_new tegra_max98090_controls[] = { SOC_DAPM_PIN_SWITCH("Headphones"), SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Int Mic"), }; static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) -- 1.9.3
next prev parent reply other threads:[~2015-01-28 10:51 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-28 10:50 [PATCH v3 00/10] Improvements to Tegra-based Chromebook support Tomeu Vizoso 2015-01-28 10:50 ` Tomeu Vizoso 2015-01-28 10:50 ` Tomeu Vizoso 2015-01-28 10:50 ` [PATCH v3 01/10] ARM: tegra: Set the sound card model that alsaucm expects Tomeu Vizoso 2015-01-28 10:50 ` Tomeu Vizoso 2015-01-28 10:50 ` Tomeu Vizoso [not found] ` <1422442278-10405-2-git-send-email-tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2015-02-02 21:08 ` Stephen Warren 2015-02-02 21:08 ` Stephen Warren 2015-02-02 21:08 ` Stephen Warren [not found] ` <54CFE754.7000500-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2015-02-03 13:13 ` Tomeu Vizoso 2015-02-03 13:13 ` Tomeu Vizoso 2015-02-03 13:13 ` Tomeu Vizoso [not found] ` <CAAObsKCm-9GOvis=MZ-nyA0N+g_ZuWYUfDSdEcVy5p5ykCmkcQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-02-03 16:35 ` Stephen Warren 2015-02-03 16:35 ` Stephen Warren 2015-02-03 16:35 ` Stephen Warren [not found] ` <54D0F8E3.3020902-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2015-02-04 9:13 ` Tomeu Vizoso 2015-02-04 9:13 ` Tomeu Vizoso 2015-02-04 9:13 ` Tomeu Vizoso [not found] ` <54D1E2B6.4050004-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> 2015-02-04 16:56 ` Stephen Warren 2015-02-04 16:56 ` Stephen Warren 2015-02-04 16:56 ` Stephen Warren 2015-01-28 10:51 ` [PATCH v3 02/10] ARM: tegra: Move out nyan-generic parts out from the nyan-big DT Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 03/10] drm/panel: add support for Samsung LTN140AT29 panel Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 04/10] ARM: tegra: Add DTS for the nyan-blaze board Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 05/10] ARM: tegra: Add node for trackpad in Nyan boards Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 06/10] ASoC: tegra: Add a control for the headphone switch Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 11:02 ` Mark Brown 2015-01-28 11:02 ` Mark Brown 2015-01-28 17:46 ` Dylan Reid 2015-01-28 17:46 ` Dylan Reid 2015-01-28 18:24 ` Mark Brown 2015-01-28 18:24 ` Mark Brown 2015-01-28 10:51 ` Tomeu Vizoso [this message] 2015-01-28 10:51 ` [PATCH v3 07/10] ASoC: tegra: add sink for the internal mic to tegra_max98090 Tomeu Vizoso 2015-01-28 17:15 ` Mark Brown 2015-01-28 17:15 ` Mark Brown 2015-01-28 10:51 ` [PATCH v3 08/10] ARM: tegra: Use pwrseq-simple for the wifi in Nyan Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 09/10] ARM: tegra: Use the generated pinmux data Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` [PATCH v3 10/10] ARM: tegra: Set spi-max-frequency property to flash node Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso 2015-01-28 10:51 ` Tomeu Vizoso
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1422442278-10405-8-git-send-email-tomeu.vizoso@collabora.com \ --to=tomeu.vizoso@collabora.com \ --cc=abrestic@chromium.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=dgreid@chromium.org \ --cc=galak@codeaurora.org \ --cc=gnurou@gmail.com \ --cc=ijc+devicetree@hellion.org.uk \ --cc=javier.martinez@collabora.co.uk \ --cc=lars@metafoo.de \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ --cc=sjg@chromium.org \ --cc=swarren@wwwdotorg.org \ --cc=thierry.reding@gmail.com \ --cc=tiwai@suse.de \ --cc=wsa@the-dreams.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.