Commit 7eec55d7 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: cs47l24: Add voice control compressed stream 



This patch adds firmware compressed stream capture support
and DAI hookups for voice control firmware (based on the wm5110
implementation.)

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 69fa8058

sound/soc/codecs/cs47l24.c

+96 −2
Original line number Diff line number Diff line
@@ -798,6 +798,9 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { 
	{ "AIF2 Capture", NULL, "SYSCLK" },

	{ "AIF3 Capture", NULL, "SYSCLK" },



	{ "Voice Control DSP", NULL, "DSP3" },

	{ "Voice Control DSP", NULL, "SYSCLK" },



	{ "IN1L PGA", NULL, "IN1L" },

	{ "IN1R PGA", NULL, "IN1R" },
@@ -992,12 +995,68 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { 
		.symmetric_rates = 1,

		.symmetric_samplebits = 1,

	},

	{

		.name = "cs47l24-cpu-voicectrl",

		.capture = {

			.stream_name = "Voice Control CPU",

			.channels_min = 1,

			.channels_max = 1,

			.rates = CS47L24_RATES,

			.formats = CS47L24_FORMATS,

		},

		.compress_new = snd_soc_new_compress,

	},

	{

		.name = "cs47l24-dsp-voicectrl",

		.capture = {

			.stream_name = "Voice Control DSP",

			.channels_min = 1,

			.channels_max = 1,

			.rates = CS47L24_RATES,

			.formats = CS47L24_FORMATS,

		},

	},

};



static int cs47l24_open(struct snd_compr_stream *stream)

{

	struct snd_soc_pcm_runtime *rtd = stream->private_data;

	struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(rtd->codec);

	struct arizona *arizona = priv->core.arizona;

	int n_adsp;



	if (strcmp(rtd->codec_dai->name, "cs47l24-dsp-voicectrl") == 0) {

		n_adsp = 2;

	} else {

		dev_err(arizona->dev,

			"No suitable compressed stream for DAI '%s'\n",

			rtd->codec_dai->name);

		return -EINVAL;

	}



	return wm_adsp_compr_open(&priv->core.adsp[n_adsp], stream);

}



static irqreturn_t cs47l24_adsp2_irq(int irq, void *data)

{

	struct cs47l24_priv *priv = data;

	struct arizona *arizona = priv->core.arizona;

	int ret;



	ret = wm_adsp_compr_handle_irq(&priv->core.adsp[2]);

	if (ret == -ENODEV) {

		dev_err(arizona->dev, "Spurious compressed data IRQ\n");

		return IRQ_NONE;

	}



	return IRQ_HANDLED;

}



static int cs47l24_codec_probe(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->core.arizona;

	int ret;



	priv->core.arizona->dapm = dapm;
@@ -1006,6 +1065,14 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec) 
	arizona_init_gpio(codec);

	arizona_init_mono(codec);



	ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,

				  "ADSP2 Compressed IRQ", cs47l24_adsp2_irq,

				  priv);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to request DSP IRQ: %d\n", ret);

		return ret;

	}



	ret = wm_adsp2_codec_probe(&priv->core.adsp[1], codec);

	if (ret)

		goto err_adsp2_codec_probe;
@@ -1033,13 +1100,14 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec) 
static int cs47l24_codec_remove(struct snd_soc_codec *codec)

{

	struct cs47l24_priv *priv = snd_soc_codec_get_drvdata(codec);



	struct arizona *arizona = priv->core.arizona;



	wm_adsp2_codec_remove(&priv->core.adsp[1], codec);

	wm_adsp2_codec_remove(&priv->core.adsp[2], codec);



	priv->core.arizona->dapm = NULL;



	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);

	return 0;

}
@@ -1076,6 +1144,19 @@ static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = { 
	.num_dapm_routes = ARRAY_SIZE(cs47l24_dapm_routes),

};



static struct snd_compr_ops cs47l24_compr_ops = {

	.open = cs47l24_open,

	.free = wm_adsp_compr_free,

	.set_params = wm_adsp_compr_set_params,

	.get_caps = wm_adsp_compr_get_caps,

	.trigger = wm_adsp_compr_trigger,

	.pointer = wm_adsp_compr_pointer,

	.copy = wm_adsp_compr_copy,

};



static struct snd_soc_platform_driver cs47l24_compr_platform = {

	.compr_ops = &cs47l24_compr_ops,

};

static int cs47l24_probe(struct platform_device *pdev)

{

	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
@@ -1139,12 +1220,25 @@ static int cs47l24_probe(struct platform_device *pdev) 
	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);



	return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_cs47l24,

	ret = snd_soc_register_platform(&pdev->dev, &cs47l24_compr_platform);

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to register platform: %d\n", ret);

		return ret;

	}

	ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_cs47l24,

				      cs47l24_dai, ARRAY_SIZE(cs47l24_dai));



	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to register codec: %d\n", ret);

		snd_soc_unregister_platform(&pdev->dev);

	}



	return ret;

}



static int cs47l24_remove(struct platform_device *pdev)

{

	snd_soc_unregister_platform(&pdev->dev);

	snd_soc_unregister_codec(&pdev->dev);

	pm_runtime_disable(&pdev->dev);