From patchwork Wed Feb 11 14:49:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 438800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4C7814028E for ; Thu, 12 Feb 2015 01:51:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513AbbBKOvK (ORCPT ); Wed, 11 Feb 2015 09:51:10 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:63593 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751157AbbBKOvG (ORCPT ); Wed, 11 Feb 2015 09:51:06 -0500 Received: by mail-we0-f175.google.com with SMTP id x3so3926999wes.6; Wed, 11 Feb 2015 06:51:05 -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=jjOjvh5VEcaqxgUqAVGrrG47yUMDFC/BsjXtKsppQcw=; b=eEspLm993RbT5kxCylNNZGt5pnePfh8xryTnvDCfIk8pauB+F23YJxzBaEJTSE5QUP iFZBrTL9pGjhx4Bu+ju/aa2Z1fWPjtHH09tIGGXMTR3Md8yueTy9uCmMeYAcIqdZjNSV 4cCjbJQnZEvww7bEVJEW1cM5KQfbsAFPj4GD/I8L3EzJEWxgo3uq8V3K5fjdStHne2Sw CpfBKwN+3jYZX4bCv+vODeMF+EIqeSuDgQ1FTICqKRqLCa4jAwksY8HxwsIcvQSOO5VA 1imPIkGc3oZoxZvfcujgQWwZITrIXtQTDrav4/YWY/v1uvNBiQ1pD5SjGx1OyJufZ32e C3Lw== X-Received: by 10.194.158.234 with SMTP id wx10mr64848707wjb.23.1423666265153; Wed, 11 Feb 2015 06:51:05 -0800 (PST) Received: from cizrna.lan (37-48-32-149.tmcz.cz. [37.48.32.149]) by mx.google.com with ESMTPSA id ch6sm1614075wjc.3.2015.02.11.06.51.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 06:51:04 -0800 (PST) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Tomeu Vizoso , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Stephen Warren , Thierry Reding , Alexandre Courbot , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Dylan Reid , Lars-Peter Clausen , Wolfram Sang , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 2/3] ASoC: tegra: Add sink for the internal mic to tegra_max98090 Date: Wed, 11 Feb 2015 15:49:53 +0100 Message-Id: <1423666200-32365-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1423666200-32365-1-git-send-email-tomeu.vizoso@collabora.com> References: <1423666200-32365-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Also adds a control for the pin of the internal mic, so userspace can apply policy when the state of the external mic jack changes. 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)