* [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop @ 2017-08-17 2:24 Lin Huang 2017-08-17 2:24 ` [PATCH v2 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang 2017-09-04 10:03 ` [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Arnaud Pouliquen 0 siblings, 2 replies; 5+ messages in thread From: Lin Huang @ 2017-08-17 2:24 UTC (permalink / raw) To: broonie, arnaud.pouliquen, dgreif Cc: alsa-devel, lgirdwood, briannorris, linux-kernel, tiwai, mka, dianders, huang lin From: huang lin <hl@rock-chips.com> 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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 010811e..d98233b 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 12e07f9..b88a1ee 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,34 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> +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), @@ -51,6 +96,7 @@ static const struct snd_soc_dapm_route intercon[] = { }; 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), -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] dt-bindings: sound: add dmicen property in dmic driver 2017-08-17 2:24 [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang @ 2017-08-17 2:24 ` Lin Huang 2017-09-04 10:03 ` [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Arnaud Pouliquen 1 sibling, 0 replies; 5+ messages in thread From: Lin Huang @ 2017-08-17 2:24 UTC (permalink / raw) To: broonie, arnaud.pouliquen, dgreif Cc: alsa-devel, lgirdwood, briannorris, linux-kernel, tiwai, mka, dianders, huang lin From: huang lin <hl@rock-chips.com> 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 v2 1/2] ASoC: codec: use enable pin to control dmic start and stop 2017-08-17 2:24 [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang 2017-08-17 2:24 ` [PATCH v2 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang @ 2017-09-04 10:03 ` Arnaud Pouliquen 2017-09-04 12:18 ` Mark Brown 2017-09-05 2:26 ` hl 1 sibling, 2 replies; 5+ messages in thread From: Arnaud Pouliquen @ 2017-09-04 10:03 UTC (permalink / raw) To: Lin Huang, broonie, dgreif Cc: alsa-devel, lgirdwood, briannorris, linux-kernel, tiwai, mka, dianders Hello Lin, Sorry for this late answer. I'm not maintainer, just a contributor... but as some update seems strange for me, so i prefer to highlight it to clarify them. On 08/17/2017 04:24 AM, Lin Huang wrote: > From: huang lin <hl@rock-chips.com> > > on some board use enable pin to control dmic start and stop, > so add this feature in dmic driver. Please, Could you give data-sheet reference of your DMIC, to help me to understand your use-case? > > Signed-off-by: Lin Huang <hl@rock-chips.com> > --- > sound/soc/codecs/Kconfig | 2 +- > sound/soc/codecs/dmic.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig > index 010811e..d98233b 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 Dependency also for DMIC without GPIO to handle gating? > 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 12e07f9..b88a1ee 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,34 @@ > #include <sound/soc.h> > #include <sound/soc-dapm.h> > > +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, > +}; > + should it be handle by trigger or DAPM? > 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); Hypothesis here is that GPIO is always set to low? seems too limiting. Regards Arnaud > + 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), > @@ -51,6 +96,7 @@ static const struct snd_soc_dapm_route intercon[] = { > }; > > 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), > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop 2017-09-04 10:03 ` [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Arnaud Pouliquen @ 2017-09-04 12:18 ` Mark Brown 2017-09-05 2:26 ` hl 1 sibling, 0 replies; 5+ messages in thread From: Mark Brown @ 2017-09-04 12:18 UTC (permalink / raw) To: Arnaud Pouliquen Cc: Lin Huang, dgreif, alsa-devel, lgirdwood, briannorris, linux-kernel, tiwai, mka, dianders [-- Attachment #1: Type: text/plain, Size: 559 bytes --] On Mon, Sep 04, 2017 at 12:03:21PM +0200, Arnaud Pouliquen wrote: > > +static const struct snd_soc_dai_ops dmic_dai_ops = { > > + .trigger = dmic_daiops_trigger, > > +}; > should it be handle by trigger or DAPM? DAPM is a bit better, yes. I don't think it matters *overly* much in this case where there's nothing else going on with the device, though bypass use cases would need it. OTOH it could mess up the timing. I was on the edge with this one but I decided that if it ends up making a problem the binding is fine and the code can be sorted later. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop 2017-09-04 10:03 ` [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Arnaud Pouliquen 2017-09-04 12:18 ` Mark Brown @ 2017-09-05 2:26 ` hl 1 sibling, 0 replies; 5+ messages in thread From: hl @ 2017-09-05 2:26 UTC (permalink / raw) To: Arnaud Pouliquen, broonie, dgreif Cc: alsa-devel, lgirdwood, briannorris, linux-kernel, tiwai, mka, dianders On Monday, September 04, 2017 06:03 PM, Arnaud Pouliquen wrote: > Hello Lin, > > Sorry for this late answer. > I'm not maintainer, just a contributor... but as some update seems > strange for me, so i prefer to highlight it to clarify them. > > On 08/17/2017 04:24 AM, Lin Huang wrote: >> From: huang lin <hl@rock-chips.com> >> >> on some board use enable pin to control dmic start and stop, >> so add this feature in dmic driver. > Please, Could you give data-sheet reference of your DMIC, to help me > to understand your use-case? >> Signed-off-by: Lin Huang <hl@rock-chips.com> >> --- >> sound/soc/codecs/Kconfig | 2 +- >> sound/soc/codecs/dmic.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 47 insertions(+), 1 deletion(-) >> >> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig >> index 010811e..d98233b 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 > Dependency also for DMIC without GPIO to handle gating? >> 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 12e07f9..b88a1ee 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,34 @@ >> #include <sound/soc.h> >> #include <sound/soc-dapm.h> >> >> +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, >> +}; >> + > should it be handle by trigger or DAPM? > > > >> 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); > Hypothesis here is that GPIO is always set to low? seems too limiting. Yes, you are right, maybe i can set it to devm_gpiod_get_optional(codec->dev, "dmicen", GPIOD_ASIS); > > Regards > Arnaud >> + 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), >> @@ -51,6 +96,7 @@ static const struct snd_soc_dapm_route intercon[] = { >> }; >> >> 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), >> > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-05 2:26 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-17 2:24 [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Lin Huang 2017-08-17 2:24 ` [PATCH v2 2/2] dt-bindings: sound: add dmicen property in dmic driver Lin Huang 2017-09-04 10:03 ` [PATCH v2 1/2] ASoC: codec: use enable pin to control dmic start and stop Arnaud Pouliquen 2017-09-04 12:18 ` Mark Brown 2017-09-05 2:26 ` hl
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.