Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685f51a5 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: wm_adsp: Firmware controls should be added as codec controls 



We were adding firmware controls as card controls (using
snd_soc_add_codec_controls). The DSP is part of a specific codec so
we should be adding them as codec controls. Adding as codec controls
also means that if the codec has a name_prefix it will be added to
the control name, which won't happen when adding as a card control.

As that was the only use of the card pointer in struct wm_adsp it can
be removed.

For ADSP2 codecs a wm_adsp2_codec_probe() was added since the original
control handling was written, and that's the logical place to store a
pointer to the codec rather than delaying it until the codec is
powered-up.

For ADSP1 we don't use a codec_probe() stage so the codec pointer
initialization replaces the original card pointer initialization in
wm_adsp1_event().

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

sound/soc/codecs/wm_adsp.c

+4 −4
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static int wmfw_add_ctl(struct wm_adsp *dsp, struct wm_coeff_ctl *ctl) 
		break;

	}



	ret = snd_soc_add_card_controls(dsp->card, kcontrol, 1);

	ret = snd_soc_add_codec_controls(dsp->codec, kcontrol, 1);

	if (ret < 0)

		goto err_kcontrol;
@@ -2301,7 +2301,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, 
	int ret;

	unsigned int val;



	dsp->card = codec->component.card;

	dsp->codec = codec;



	mutex_lock(&dsp->pwr_lock);
@@ -2512,8 +2512,6 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w, 
	struct wm_adsp *dsp = &dsps[w->shift];

	struct wm_coeff_ctl *ctl;



	dsp->card = codec->component.card;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		wm_adsp2_set_dspclk(dsp, freq);
@@ -2631,6 +2629,8 @@ EXPORT_SYMBOL_GPL(wm_adsp2_event); 


int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec)

{

	dsp->codec = codec;



	wm_adsp2_init_debugfs(dsp, codec);



	return snd_soc_add_codec_controls(codec,

sound/soc/codecs/wm_adsp.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct wm_adsp { 
	int type;

	struct device *dev;

	struct regmap *regmap;

	struct snd_soc_card *card;

	struct snd_soc_codec *codec;



	int base;

	int sysclk_reg;