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

Commit 022658be authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core: Add support for DAI and machine kcontrols. 



Currently ASoC can only add kcontrols using codec and platform component device
handles. It's also desirable to add kcontrols for DAIs (i.e. McBSP) and for
SoC card machine drivers too. This allows the kcontrol to have a direct handle to
the parent ASoC component DAI/SoC Card/Platform/Codec device and hence easily
get it's private data.

This change makes snd_soc_add_controls() static and wraps it in the folowing
calls (card and dai are new) :-

snd_soc_add_card_controls()
snd_soc_add_codec_controls()
snd_soc_add_dai_controls()
snd_soc_add_platform_controls()

This patch also does a lot of small mechanical changes in individual codec drivers
to replace snd_soc_add_controls() with snd_soc_add_codec_controls().

It also updates the McBSP DAI driver to use snd_soc_add_dai_controls().

Finally, it updates the existing machine drivers that register controls to either :-

1) Use snd_soc_add_card_controls() where no direct codec control is required.
2) Use snd_soc_add_codec_controls() where there is direct codec control.

In the case of 1) above we also update the machine drivers to get the correct
component data pointers from the kcontrol (rather than getting the machine pointer
via the codec pointer).

Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 83344027

include/sound/soc.h

+5 −1
Original line number Diff line number Diff line
@@ -368,10 +368,14 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); 
struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,

				  void *data, char *long_name,

				  const char *prefix);

int snd_soc_add_controls(struct snd_soc_codec *codec,

int snd_soc_add_codec_controls(struct snd_soc_codec *codec,

	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_add_platform_controls(struct snd_soc_platform *platform,

	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_add_card_controls(struct snd_soc_card *soc_card,

	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_add_dai_controls(struct snd_soc_dai *dai,

	const struct snd_kcontrol_new *controls, int num_controls);

int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol,

sound/soc/codecs/ad1836.c

+3 −3
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int ad1836_probe(struct snd_soc_codec *codec) 
	if (ad1836->type == AD1836) {

		/* left/right diff:PGA/MUX */

		snd_soc_write(codec, AD1836_ADC_CTRL3, 0x3A);

		ret = snd_soc_add_controls(codec, ad1836_controls,

		ret = snd_soc_add_codec_controls(codec, ad1836_controls,

				ARRAY_SIZE(ad1836_controls));

		if (ret)

			return ret;
@@ -285,11 +285,11 @@ static int ad1836_probe(struct snd_soc_codec *codec) 
		snd_soc_write(codec, AD1836_ADC_CTRL3, 0x00);

	}



	ret = snd_soc_add_controls(codec, ad183x_dac_controls, num_dacs * 2);

	ret = snd_soc_add_codec_controls(codec, ad183x_dac_controls, num_dacs * 2);

	if (ret)

		return ret;



	ret = snd_soc_add_controls(codec, ad183x_adc_controls, num_adcs);

	ret = snd_soc_add_codec_controls(codec, ad183x_adc_controls, num_adcs);

	if (ret)

		return ret;

sound/soc/codecs/ad1980.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) 
	ext_status = ac97_read(codec, AC97_EXTENDED_STATUS);

	ac97_write(codec, AC97_EXTENDED_STATUS, ext_status&~0x3800);



	snd_soc_add_controls(codec, ad1980_snd_ac97_controls,

	snd_soc_add_codec_controls(codec, ad1980_snd_ac97_controls,

				ARRAY_SIZE(ad1980_snd_ac97_controls));



	return 0;

sound/soc/codecs/adau1373.c

+2 −2
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
				pdata->drc_setting[i]);

		}



		snd_soc_add_controls(codec, adau1373_drc_controls,

		snd_soc_add_codec_controls(codec, adau1373_drc_controls,

			pdata->num_drc);



		val = 0;
@@ -1282,7 +1282,7 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
	}



	if (!lineout_differential) {

		snd_soc_add_controls(codec, adau1373_lineout2_controls,

		snd_soc_add_codec_controls(codec, adau1373_lineout2_controls,

			ARRAY_SIZE(adau1373_lineout2_controls));

	}

sound/soc/codecs/ak4535.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int ak4535_probe(struct snd_soc_codec *codec) 
	/* power on device */

	ak4535_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	snd_soc_add_controls(codec, ak4535_snd_controls,

	snd_soc_add_codec_controls(codec, ak4535_snd_controls,

				ARRAY_SIZE(ak4535_snd_controls));

	return 0;

}