Merge tag 'alsa-add-snd-sgbuf-aligned-pages' of https://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / sound / soc / amd / acp-da7219-max98357a.c

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index ccddc6650b9c79a112791e3d5ecd2e11d77e8494..8e3275a96a82102be7da0d4d2dc6b694c01571fd 100644 (file)
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -32,6 +32,8 @@
 #include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/module.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/driver.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/acpi.h>
@@ -148,7 +150,8 @@ static int cz_da7219_startup(struct snd_pcm_substream *substream)
        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                   &constraints_rates);
 
-       machine->i2s_instance = I2S_BT_INSTANCE;
+       machine->i2s_instance = I2S_SP_INSTANCE;
+       machine->capture_channel = CAP_CHANNEL1;
        return da7219_clk_enable(substream);
 }
 
@@ -163,7 +166,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream)
        struct snd_soc_card *card = rtd->card;
        struct acp_platform_info *machine = snd_soc_card_get_drvdata(card);
 
-       machine->i2s_instance = I2S_SP_INSTANCE;
+       machine->i2s_instance = I2S_BT_INSTANCE;
        return da7219_clk_enable(substream);
 }
 
@@ -172,13 +175,24 @@ static void cz_max_shutdown(struct snd_pcm_substream *substream)
        da7219_clk_disable();
 }
 
-static int cz_dmic_startup(struct snd_pcm_substream *substream)
+static int cz_dmic0_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_card *card = rtd->card;
+       struct acp_platform_info *machine = snd_soc_card_get_drvdata(card);
+
+       machine->i2s_instance = I2S_BT_INSTANCE;
+       return da7219_clk_enable(substream);
+}
+
+static int cz_dmic1_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_card *card = rtd->card;
        struct acp_platform_info *machine = snd_soc_card_get_drvdata(card);
 
        machine->i2s_instance = I2S_SP_INSTANCE;
+       machine->capture_channel = CAP_CHANNEL0;
        return da7219_clk_enable(substream);
 }
 
@@ -197,23 +211,39 @@ static const struct snd_soc_ops cz_max_play_ops = {
        .shutdown = cz_max_shutdown,
 };
 
-static const struct snd_soc_ops cz_dmic_cap_ops = {
-       .startup = cz_dmic_startup,
+static const struct snd_soc_ops cz_dmic0_cap_ops = {
+       .startup = cz_dmic0_startup,
+       .shutdown = cz_dmic_shutdown,
+};
+
+static const struct snd_soc_ops cz_dmic1_cap_ops = {
+       .startup = cz_dmic1_startup,
        .shutdown = cz_dmic_shutdown,
 };
 
 static struct snd_soc_dai_link cz_dai_7219_98357[] = {
        {
-               .name = "amd-da7219-play-cap",
-               .stream_name = "Playback and Capture",
+               .name = "amd-da7219-play",
+               .stream_name = "Playback",
                .platform_name = "acp_audio_dma.0.auto",
-               .cpu_dai_name = "designware-i2s.3.auto",
+               .cpu_dai_name = "designware-i2s.1.auto",
                .codec_dai_name = "da7219-hifi",
                .codec_name = "i2c-DLGS7219:00",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .init = cz_da7219_init,
                .dpcm_playback = 1,
+               .ops = &cz_da7219_cap_ops,
+       },
+       {
+               .name = "amd-da7219-cap",
+               .stream_name = "Capture",
+               .platform_name = "acp_audio_dma.0.auto",
+               .cpu_dai_name = "designware-i2s.2.auto",
+               .codec_dai_name = "da7219-hifi",
+               .codec_name = "i2c-DLGS7219:00",
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                               | SND_SOC_DAIFMT_CBM_CFM,
                .dpcm_capture = 1,
                .ops = &cz_da7219_cap_ops,
        },
@@ -221,7 +251,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "amd-max98357-play",
                .stream_name = "HiFi Playback",
                .platform_name = "acp_audio_dma.0.auto",
-               .cpu_dai_name = "designware-i2s.1.auto",
+               .cpu_dai_name = "designware-i2s.3.auto",
                .codec_dai_name = "HiFi",
                .codec_name = "MX98357A:00",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
@@ -230,8 +260,22 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .ops = &cz_max_play_ops,
        },
        {
-               .name = "dmic",
-               .stream_name = "DMIC Capture",
+               /* C panel DMIC */
+               .name = "dmic0",
+               .stream_name = "DMIC0 Capture",
+               .platform_name = "acp_audio_dma.0.auto",
+               .cpu_dai_name = "designware-i2s.3.auto",
+               .codec_dai_name = "adau7002-hifi",
+               .codec_name = "ADAU7002:00",
+               .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
+                               | SND_SOC_DAIFMT_CBM_CFM,
+               .dpcm_capture = 1,
+               .ops = &cz_dmic0_cap_ops,
+       },
+       {
+               /* A/B panel DMIC */
+               .name = "dmic1",
+               .stream_name = "DMIC1 Capture",
                .platform_name = "acp_audio_dma.0.auto",
                .cpu_dai_name = "designware-i2s.2.auto",
                .codec_dai_name = "adau7002-hifi",
@@ -239,7 +283,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBM_CFM,
                .dpcm_capture = 1,
-               .ops = &cz_dmic_cap_ops,
+               .ops = &cz_dmic1_cap_ops,
        },
 };
 
@@ -278,11 +322,52 @@ static struct snd_soc_card cz_card = {
        .num_controls = ARRAY_SIZE(cz_mc_controls),
 };
 
+static struct regulator_consumer_supply acp_da7219_supplies[] = {
+       REGULATOR_SUPPLY("VDD", "i2c-DLGS7219:00"),
+       REGULATOR_SUPPLY("VDDMIC", "i2c-DLGS7219:00"),
+       REGULATOR_SUPPLY("VDDIO", "i2c-DLGS7219:00"),
+       REGULATOR_SUPPLY("IOVDD", "ADAU7002:00"),
+};
+
+static struct regulator_init_data acp_da7219_data = {
+       .constraints = {
+               .always_on = 1,
+       },
+       .num_consumer_supplies = ARRAY_SIZE(acp_da7219_supplies),
+       .consumer_supplies = acp_da7219_supplies,
+};
+
+static struct regulator_config acp_da7219_cfg = {
+       .init_data = &acp_da7219_data,
+};
+
+static struct regulator_ops acp_da7219_ops = {
+};
+
+static struct regulator_desc acp_da7219_desc = {
+       .name = "reg-fixed-1.8V",
+       .type = REGULATOR_VOLTAGE,
+       .owner = THIS_MODULE,
+       .ops = &acp_da7219_ops,
+       .fixed_uV = 1800000, /* 1.8V */
+       .n_voltages = 1,
+};
+
 static int cz_probe(struct platform_device *pdev)
 {
        int ret;
        struct snd_soc_card *card;
        struct acp_platform_info *machine;
+       struct regulator_dev *rdev;
+
+       acp_da7219_cfg.dev = &pdev->dev;
+       rdev = devm_regulator_register(&pdev->dev, &acp_da7219_desc,
+                                      &acp_da7219_cfg);
+       if (IS_ERR(rdev)) {
+               dev_err(&pdev->dev, "Failed to register regulator: %d\n",
+                       (int)PTR_ERR(rdev));
+               return -EINVAL;
+       }
 
        machine = devm_kzalloc(&pdev->dev, sizeof(struct acp_platform_info),
                               GFP_KERNEL);