ASoc: amd: Add DMIC switch capability to machine driver (72c3b2b0) · Commits · 戴 / test

sound/soc/amd/acp3x-rt5682-max9836.c

+47 −6

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#include <sound/jack.h>
		#include <linux/clk.h>
		#include <linux/gpio.h>
		#include <linux/gpio/consumer.h>
		#include <linux/module.h>
		#include <linux/i2c.h>
		#include <linux/input.h>
		@@ -27,6 +28,7 @@
		static struct snd_soc_jack pco_jack;
		static struct clk *rt5682_dai_wclk;
		static struct clk *rt5682_dai_bclk;
		static struct gpio_desc *dmic_sel;

		static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)
		{
		@@ -176,7 +178,7 @@ static int acp3x_max_startup(struct snd_pcm_substream *substream)
		return rt5682_clk_enable(substream);
		}

		static int acp3x_ec_startup(struct snd_pcm_substream *substream)
		static int acp3x_ec_dmic0_startup(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_card *card = rtd->card;
		@@ -185,6 +187,23 @@ static int acp3x_ec_startup(struct snd_pcm_substream *substream)

		machine->cap_i2s_instance = I2S_BT_INSTANCE;
		snd_soc_dai_set_bclk_ratio(codec_dai, 64);
		if (dmic_sel)
		gpiod_set_value(dmic_sel, 0);

		return rt5682_clk_enable(substream);
		}

		static int acp3x_ec_dmic1_startup(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_card *card = rtd->card;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		struct acp3x_platform_info *machine = snd_soc_card_get_drvdata(card);

		machine->cap_i2s_instance = I2S_BT_INSTANCE;
		snd_soc_dai_set_bclk_ratio(codec_dai, 64);
		if (dmic_sel)
		gpiod_set_value(dmic_sel, 1);

		return rt5682_clk_enable(substream);
		}
		@@ -204,8 +223,13 @@ static const struct snd_soc_ops acp3x_max_play_ops = {
		.shutdown = rt5682_shutdown,
		};

		static const struct snd_soc_ops acp3x_ec_cap_ops = {
		.startup = acp3x_ec_startup,
		static const struct snd_soc_ops acp3x_ec_cap0_ops = {
		.startup = acp3x_ec_dmic0_startup,
		.shutdown = rt5682_shutdown,
		};

		static const struct snd_soc_ops acp3x_ec_cap1_ops = {
		.startup = acp3x_ec_dmic1_startup,
		.shutdown = rt5682_shutdown,
		};

		@@ -246,12 +270,21 @@ static struct snd_soc_dai_link acp3x_dai_5682_98357[] = {
		SND_SOC_DAILINK_REG(acp3x_bt, max, platform),
		},
		{
		.name = "acp3x-ec-capture",
		.stream_name = "Capture",
		.name = "acp3x-ec-dmic0-capture",
		.stream_name = "Capture DMIC0",
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBS_CFS,
		.dpcm_capture = 1,
		.ops = &acp3x_ec_cap0_ops,
		SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform),
		},
		{
		.name = "acp3x-ec-dmic1-capture",
		.stream_name = "Capture DMIC1",
		.dai_fmt = SND_SOC_DAIFMT_I2S \| SND_SOC_DAIFMT_NB_NF
		\| SND_SOC_DAIFMT_CBS_CFS,
		.dpcm_capture = 1,
		.ops = &acp3x_ec_cap_ops,
		.ops = &acp3x_ec_cap1_ops,
		SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform),
		},
		};
		@@ -302,6 +335,14 @@ static int acp3x_probe(struct platform_device *pdev)
		acp3x_card.dev = &pdev->dev;
		platform_set_drvdata(pdev, card);
		snd_soc_card_set_drvdata(card, machine);

		dmic_sel = devm_gpiod_get(&pdev->dev, "dmic", GPIOD_OUT_LOW);
		if (IS_ERR(dmic_sel)) {
		dev_err(&pdev->dev, "DMIC gpio failed err=%d\n",
		PTR_ERR(dmic_sel));
		return PTR_ERR(dmic_sel);
		}

		ret = devm_snd_soc_register_card(&pdev->dev, &acp3x_card);
		if (ret) {
		dev_err(&pdev->dev,

Admin message