linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop
@ 2017-08-11  7:31 Lin Huang
  2017-08-11  7:31 ` [PATCH 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang
  2017-08-16 14:50 ` [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Mark Brown
  0 siblings, 2 replies; 5+ messages in thread
From: Lin Huang @ 2017-08-11  7:31 UTC (permalink / raw)
  To: broonie, arnaud.pouliquen, dgreif
  Cc: perex, tiwai, alsa-devel, linux-kernel, briannorris, dianders,
	lgirdwood, Lin Huang

on some board use enable pin to control dmic start and stop,
so add this feature in dmic driver.

Signed-off-by: Lin Huang <hl@rock-chips.com>
---
 sound/soc/codecs/Kconfig |  2 +-
 sound/soc/codecs/dmic.c  | 61 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index ccc5814..dff3586 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -61,7 +61,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_DA7219 if I2C
 	select SND_SOC_DA732X if I2C
 	select SND_SOC_DA9055 if I2C
-	select SND_SOC_DMIC
+	select SND_SOC_DMIC if GPIOLIB
 	select SND_SOC_BT_SCO
 	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 32b7a48..c4e5f47 100644
--- a/sound/soc/codecs/dmic.c
+++ b/sound/soc/codecs/dmic.c
@@ -19,6 +19,8 @@
  *
  */
 
+#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -27,6 +29,39 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 
+struct dmic_priv {
+	struct gpio_desc *dmic_en;
+};
+
+static int dmic_daiops_trigger(struct snd_pcm_substream *substream,
+		int cmd, struct snd_soc_dai *dai)
+{
+	struct snd_soc_codec *codec = dai->codec;
+	struct dmic_priv *dmic_data = snd_soc_codec_get_drvdata(codec);
+
+	if (!dmic_data->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_data->dmic_en, 1);
+		break;
+	case SNDRV_PCM_TRIGGER_STOP:
+	case SNDRV_PCM_TRIGGER_SUSPEND:
+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+		gpiod_set_value(dmic_data->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 +73,24 @@ 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 dmic_priv *dmic_data = snd_soc_codec_get_drvdata(codec);
+
+	dmic_data->dmic_en = devm_gpiod_get_optional(codec->dev,
+						"dmicen", GPIOD_OUT_LOW);
+
+	if (IS_ERR(dmic_data->dmic_en))
+		return PTR_ERR(dmic_data->dmic_en);
+
+	snd_soc_codec_set_drvdata(codec, dmic_data);
+
+	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),
@@ -51,6 +102,7 @@ static const struct snd_soc_dapm_route intercon[] = {
 };
 
 static struct snd_soc_codec_driver soc_dmic = {
+	.probe = dmic_codec_probe,
 	.dapm_widgets = dmic_dapm_widgets,
 	.num_dapm_widgets = ARRAY_SIZE(dmic_dapm_widgets),
 	.dapm_routes = intercon,
@@ -59,6 +111,15 @@ static struct snd_soc_codec_driver soc_dmic = {
 
 static int dmic_dev_probe(struct platform_device *pdev)
 {
+	struct dmic_priv *dmic_data;
+
+	dmic_data = devm_kzalloc(&pdev->dev, sizeof(*dmic_data), GFP_KERNEL);
+
+	if (!dmic_data)
+		return -ENOMEM;
+
+	dev_set_drvdata(&pdev->dev, dmic_data);
+
 	return snd_soc_register_codec(&pdev->dev,
 			&soc_dmic, &dmic_dai, 1);
 }
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] dt-bindings: sound: add dmicen property in dmic driver
  2017-08-11  7:31 [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang
@ 2017-08-11  7:31 ` Lin Huang
  2017-08-17 17:13   ` Applied "dt-bindings: sound: add dmicen property in dmic driver" to the asoc tree Mark Brown
  2017-08-16 14:50 ` [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Mark Brown
  1 sibling, 1 reply; 5+ messages in thread
From: Lin Huang @ 2017-08-11  7:31 UTC (permalink / raw)
  To: broonie, arnaud.pouliquen, dgreif
  Cc: perex, tiwai, alsa-devel, linux-kernel, briannorris, dianders,
	lgirdwood, Lin Huang

there may use enable pin to control dmic start and stop,
so add this property in dt-bindings.

Signed-off-by: Lin Huang <hl@rock-chips.com>
---
 Documentation/devicetree/bindings/sound/dmic.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/dmic.txt b/Documentation/devicetree/bindings/sound/dmic.txt
index a0c58f2..54c8ef6 100644
--- a/Documentation/devicetree/bindings/sound/dmic.txt
+++ b/Documentation/devicetree/bindings/sound/dmic.txt
@@ -5,8 +5,12 @@ This device support generic PDM digital microphone.
 Required properties:
 	- compatible: should be "dmic-codec".
 
+Optional properties:
+	- dmicen-gpios: GPIO specifier for dmic to control start and stop
+
 Example node:
 
 	dmic_codec: dmic@0 {
 		compatible = "dmic-codec";
+		dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
 	};
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop
  2017-08-11  7:31 [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang
  2017-08-11  7:31 ` [PATCH 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang
@ 2017-08-16 14:50 ` Mark Brown
  2017-08-17  2:26   ` hl
  1 sibling, 1 reply; 5+ messages in thread
From: Mark Brown @ 2017-08-16 14:50 UTC (permalink / raw)
  To: Lin Huang
  Cc: arnaud.pouliquen, dgreif, perex, tiwai, alsa-devel, linux-kernel,
	briannorris, dianders, lgirdwood

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

On Fri, Aug 11, 2017 at 03:31:28PM +0800, Lin Huang wrote:
> on some board use enable pin to control dmic start and stop,
> so add this feature in dmic driver.

This doens't apply against current code, please check and resend.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop
  2017-08-16 14:50 ` [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Mark Brown
@ 2017-08-17  2:26   ` hl
  0 siblings, 0 replies; 5+ messages in thread
From: hl @ 2017-08-17  2:26 UTC (permalink / raw)
  To: Mark Brown
  Cc: arnaud.pouliquen, dgreif, perex, tiwai, alsa-devel, linux-kernel,
	briannorris, dianders, lgirdwood



On Wednesday, August 16, 2017 10:50 PM, Mark Brown wrote:
> On Fri, Aug 11, 2017 at 03:31:28PM +0800, Lin Huang wrote:
>> on some board use enable pin to control dmic start and stop,
>> so add this feature in dmic driver.
> This doens't apply against current code, please check and resend.
Oh, Thanks for pointing it, have send new version patches.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Applied "dt-bindings: sound: add dmicen property in dmic driver" to the asoc tree
  2017-08-11  7:31 ` [PATCH 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang
@ 2017-08-17 17:13   ` Mark Brown
  0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2017-08-17 17:13 UTC (permalink / raw)
  To: huang lin
  Cc: Lin Huang, Mark Brown, broonie, arnaud.pouliquen, dgreif,
	alsa-devel, Lin Huang, lgirdwood, briannorris, dianders,
	linux-kernel, tiwai, alsa-devel

The patch

   dt-bindings: sound: add dmicen property in dmic driver

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 8c9741b1b91d9fb4f094bfa66f0ae02c9a495f48 Mon Sep 17 00:00:00 2001
From: huang lin <hl@rock-chips.com>
Date: Thu, 17 Aug 2017 10:24:45 +0800
Subject: [PATCH] dt-bindings: sound: add dmicen property in dmic driver

there may use enable pin to control dmic start and stop,
so add this property in dt-bindings.

Signed-off-by: Lin Huang <hl@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 Documentation/devicetree/bindings/sound/dmic.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/dmic.txt b/Documentation/devicetree/bindings/sound/dmic.txt
index a0c58f2a162a..54c8ef6498a8 100644
--- a/Documentation/devicetree/bindings/sound/dmic.txt
+++ b/Documentation/devicetree/bindings/sound/dmic.txt
@@ -5,8 +5,12 @@ This device support generic PDM digital microphone.
 Required properties:
 	- compatible: should be "dmic-codec".
 
+Optional properties:
+	- dmicen-gpios: GPIO specifier for dmic to control start and stop
+
 Example node:
 
 	dmic_codec: dmic@0 {
 		compatible = "dmic-codec";
+		dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
 	};
-- 
2.13.3

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-08-17 17:13 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-11  7:31 [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang
2017-08-11  7:31 ` [PATCH 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang
2017-08-17 17:13   ` Applied "dt-bindings: sound: add dmicen property in dmic driver" to the asoc tree Mark Brown
2017-08-16 14:50 ` [PATCH 1/2] ASoC: codec: use enable pin to control dmic start and stop Mark Brown
2017-08-17  2:26   ` hl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).