From patchwork Wed Jan 28 10:51:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 5727821 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5EB1B9F1C5 for ; Wed, 28 Jan 2015 10:53:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E16D20270 for ; Wed, 28 Jan 2015 10:53:18 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 18A13201F2 for ; Wed, 28 Jan 2015 10:53:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2B33A261A97; Wed, 28 Jan 2015 11:53:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 0F4FD261A3D; Wed, 28 Jan 2015 11:52:38 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4BF25261A73; Wed, 28 Jan 2015 11:52:37 +0100 (CET) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by alsa0.perex.cz (Postfix) with ESMTP id 822A3261A3D for ; Wed, 28 Jan 2015 11:52:26 +0100 (CET) Received: by mail-we0-f179.google.com with SMTP id q59so20018813wes.10 for ; Wed, 28 Jan 2015 02:52:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=6n0zV0XLl0/2VhgXoTFnG6WuyTPoVJ1ALZRCFBp5j60=; b=bnUk9enxm9SkXwfKackNiQ6s9W+M0GyAHIoiPNws+gODsFNFim8NmlAmaYN/YjQIXj X88TTPFyaZEiLqDB7vFydUGyNybcEAs8t8wBcB1zrsMUHV638CymqrZePWgxSQzLIdKs Z7ZeuDeG+yIwU2Dl+RFeehfFs/PVVwOLyOhHq4eYAA6kUs2wtGOWZDhnh4HzNSHOWKHj G1j1nU3KLLyxgMhY1yRKjWdpkTZnIV8ZS6sDYhNiv/q0SFEF//gPrgBwYpzZPBZFP+ii fTKtnlIhSjoefq4CfE2Tbq18m3GzgEB5sHL2pUKjHlVF4MTsyt637+AQWHqj8zTlq6+H Wo3A== X-Received: by 10.180.108.239 with SMTP id hn15mr5906305wib.5.1422442346190; Wed, 28 Jan 2015 02:52:26 -0800 (PST) Received: from cizrna.lan (37-48-33-238.tmcz.cz. [37.48.33.238]) by mx.google.com with ESMTPSA id cy8sm2257004wib.9.2015.01.28.02.52.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jan 2015 02:52:25 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Date: Wed, 28 Jan 2015 11:51:05 +0100 Message-Id: <1422442278-10405-8-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1422442278-10405-1-git-send-email-tomeu.vizoso@collabora.com> References: <1422442278-10405-1-git-send-email-tomeu.vizoso@collabora.com> Cc: Mark Rutland , alsa-devel@alsa-project.org, Wolfram Sang , Andrew Bresticker , Thierry Reding , Alexandre Courbot , Lars-Peter Clausen , Stephen Warren , Takashi Iwai , Dylan Reid , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Rob Herring , linux-tegra@vger.kernel.org, Tomeu Vizoso , Simon Glass , Liam Girdwood , Mark Brown , Kumar Gala , Javier Martinez Canillas Subject: [alsa-devel] [PATCH v3 07/10] ASoC: tegra: add sink for the internal mic to tegra_max98090 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This is used in the Tegra-based Chromebooks. Signed-off-by: Tomeu Vizoso --- 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)