From patchwork Thu Aug 17 17:13:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 110328 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp2465002qge; Thu, 17 Aug 2017 10:13:29 -0700 (PDT) X-Received: by 10.28.156.10 with SMTP id f10mr357809wme.35.1502990009081; Thu, 17 Aug 2017 10:13:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502990009; cv=none; d=google.com; s=arc-20160816; b=o1lz89viFmaiFBlHkDGBc3EYjU7idn2GRVcQ3R4zpWK+fBE9b97wCifO8QwWXy+oEo GX8gCX8l6E+NQXUM9ELS8ly7lib9XZnHTSTlpX5AWXic6zotxX6LIBXz8l0sPWKuRalE mRbZXt2uKk1l8IYtvU/nWA2XMY8jlTnLDvdlmA0OUm+vXx9rQ7Il8LkqPXFyhVNH0NaM QDdlMc9cl1SpI7ZeUq+uxa+3Ln1ztuHp7P0jUBNDJt3vmYMhe3u455z/USTUtMjSsUiE 6L5whNelaawZ+PUDwdoBBPuvE1lSiIbMUmpMFjuUIBDM1rczMRJHpFFDgIvqMbLfjlQe /mYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=/tTx9huppWYstcj/NYaQcpKE83af88PTfxrqhqTWTMI=; b=fTk/2YuZ+5UJchKFO68q02zFUQ4lhNx9lCQRu9gx/y4eQUdBnhfk3JtIuIMJxm5QtX +i4Cw4naaiwZUNTHwGnXqwnUntjiL9x1GJS2Le0jNCCc4gPHPsVObrMC6m5fWlt4Uffk ugrsuwIQnvj7zEuX30HJwAFHrq2no+hda/5/Qb3IdK+XDe7GWewfYcchGfmi3GiQG/1c Mruw/cZJ8FgxGRdA9wrXYviZh6NlT5GOCzclq+YmKSuP5L2u+6gSCXTDKbJj0D+8GZMM qNd7t11IQoogiZhSviTvayJX0LJi2fcuur4Z3scsOnMwOy6bx+VuIv/huzcLDIU+ifW4 tMow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=OCiOndtm; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id c26si2893952wrg.66.2017.08.17.10.13.28; Thu, 17 Aug 2017 10:13:29 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=OCiOndtm; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0A58E266FD8; Thu, 17 Aug 2017 19:13:26 +0200 (CEST) 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 B83B5266FDE; Thu, 17 Aug 2017 19:13:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 25593266F7A for ; Thu, 17 Aug 2017 19:13:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=NSm7PMyC6Dxa+t9LB01K1yIU0ZYR69AtEws8AncUL1U=; b=OCiOndtmvzDh zDKAK5QDmn8xpna0LZIBX8Y8s4wfRnpt/BToIkJXn/Vzclik8ZSAJMNwD3knFQjdJgo+bpvRLCNnW /iyvq929cVY5m+39Otj0627ow018J4aiStTHCAKgZ+laxyYr58ggWrZIjGDP0wkUdSMnIv2CbjzGO twuVk=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1diOMD-00078x-78; Thu, 17 Aug 2017 17:13:21 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1diOMC-0008Sl-RK; Thu, 17 Aug 2017 18:13:20 +0100 From: Mark Brown To: huang lin In-Reply-To: Message-Id: Date: Thu, 17 Aug 2017 18:13:20 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown , Lin Huang Subject: [alsa-devel] Applied "ASoC: codec: use enable pin to control dmic start and stop" to the asoc tree 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 The patch ASoC: codec: use enable pin to control dmic start and stop has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 23c7159a799f3364720b3d250f57bc8e26b17287 Mon Sep 17 00:00:00 2001 From: huang lin Date: Thu, 17 Aug 2017 10:24:44 +0800 Subject: [PATCH] ASoC: codec: use enable pin to control dmic start and stop on some board use enable pin to control dmic start and stop, so add this feature in dmic driver. Signed-off-by: Lin Huang Signed-off-by: Mark Brown --- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/dmic.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) -- 2.13.3 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 6c78b0b49b81..952c44dd5e90 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -71,7 +71,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_DA732X if I2C select SND_SOC_DA9055 if I2C select SND_SOC_DIO2125 - select SND_SOC_DMIC + select SND_SOC_DMIC if GPIOLIB select SND_SOC_ES8316 if I2C select SND_SOC_ES8328_SPI if SPI_MASTER select SND_SOC_ES8328_I2C if I2C diff --git a/sound/soc/codecs/dmic.c b/sound/soc/codecs/dmic.c index d50f142e2972..b88a1ee66f80 100644 --- a/sound/soc/codecs/dmic.c +++ b/sound/soc/codecs/dmic.c @@ -19,6 +19,8 @@ * */ +#include +#include #include #include #include @@ -27,6 +29,34 @@ #include #include +static int dmic_daiops_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct gpio_desc *dmic_en = snd_soc_dai_get_drvdata(dai); + + if (!dmic_en) + return 0; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + gpiod_set_value(dmic_en, 1); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + gpiod_set_value(dmic_en, 0); + break; + } + + return 0; +} + +static const struct snd_soc_dai_ops dmic_dai_ops = { + .trigger = dmic_daiops_trigger, +}; + static struct snd_soc_dai_driver dmic_dai = { .name = "dmic-hifi", .capture = { @@ -38,8 +68,23 @@ static struct snd_soc_dai_driver dmic_dai = { | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, }, + .ops = &dmic_dai_ops, }; +static int dmic_codec_probe(struct snd_soc_codec *codec) +{ + struct gpio_desc *dmic_en; + + dmic_en = devm_gpiod_get_optional(codec->dev, + "dmicen", GPIOD_OUT_LOW); + if (IS_ERR(dmic_en)) + return PTR_ERR(dmic_en); + + snd_soc_codec_set_drvdata(codec, dmic_en); + + return 0; +} + static const struct snd_soc_dapm_widget dmic_dapm_widgets[] = { SND_SOC_DAPM_AIF_OUT("DMIC AIF", "Capture", 0, SND_SOC_NOPM, 0, 0), @@ -50,7 +95,8 @@ static const struct snd_soc_dapm_route intercon[] = { {"DMIC AIF", NULL, "DMic"}, }; -static struct snd_soc_codec_driver soc_dmic = { +static const struct snd_soc_codec_driver soc_dmic = { + .probe = dmic_codec_probe, .component_driver = { .dapm_widgets = dmic_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets),