Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --git a/Documentation/devicetree/bindings/sound/dmic.txt b/Documentation/devicetree/bindings/sound/dmic.txt
new file mode 100644 (file)
index 0000000..54c8ef6
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/dmic.txt
@@ -0,0 +1,16 @@
+Device-Tree bindings for Digital microphone (DMIC) codec
+
+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>;
+       };

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 024ddc9938ed5c16c93bd745a86d8fe53c439a7f..aee9ef16dae62b91394fbcc56c7a22c9fda71b92 100644 (file)
--- 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 6fe6c0ac4f0b8919aa093d6b617113a1599a1a1e..b88a1ee66f80135b55e7c211e4794a46e202232c 100644 (file)
--- 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),
@@ -73,9 +119,15 @@ static int dmic_dev_remove(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:dmic-codec");
 
+static const struct of_device_id dmic_dev_match[] = {
+       {.compatible = "dmic-codec"},
+       {}
+};
+
 static struct platform_driver dmic_driver = {
        .driver = {
                .name = "dmic-codec",
+               .of_match_table = dmic_dev_match,
        },
        .probe = dmic_dev_probe,
        .remove = dmic_dev_remove,