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

Commit d2b247a8 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Add virtual enumeration support for DAPM muxes 



Sometimes it is desirable to have a mux which does not reflect any
direct register configuration but which will instead only have an
effect implicitly (for example, as a result of changing which parts
of the device are powered up). Provide a virtual mux for this purpose.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3a65577d

include/sound/soc-dapm.h

+10 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ 
 	.get = snd_soc_dapm_get_enum_double, \

 	.put = snd_soc_dapm_put_enum_double, \

  	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_ENUM_VIRT(xname, xenum)		    \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \

	.get = snd_soc_dapm_get_enum_virt, \

	.put = snd_soc_dapm_put_enum_virt, \

	.private_value = (unsigned long)&xenum }

#define SOC_DAPM_VALUE_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \

	.info = snd_soc_info_enum_double, \
@@ -260,6 +266,10 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,

sound/soc/soc-dapm.c

+48 −0
Original line number Diff line number Diff line
@@ -1807,6 +1807,54 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_double);



/**

 * snd_soc_dapm_get_enum_virt - Get virtual DAPM mux

 * @kcontrol: mixer control

 * @ucontrol: control element information

 *

 * Returns 0 for success.

 */

int snd_soc_dapm_get_enum_virt(struct snd_kcontrol *kcontrol,

			       struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);



	ucontrol->value.enumerated.item[0] = widget->value;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_get_enum_virt);



/**

 * snd_soc_dapm_put_enum_virt - Set virtual DAPM mux

 * @kcontrol: mixer control

 * @ucontrol: control element information

 *

 * Returns 0 for success.

 */

int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,

			       struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);

	struct soc_enum *e =

		(struct soc_enum *)kcontrol->private_value;

	int change;

	int ret = 0;



	if (ucontrol->value.enumerated.item[0] >= e->max)

		return -EINVAL;



	mutex_lock(&widget->codec->mutex);



	change = widget->value != ucontrol->value.enumerated.item[0];

	widget->value = ucontrol->value.enumerated.item[0];

	dapm_mux_update_power(widget, kcontrol, change, widget->value, e);



	mutex_unlock(&widget->codec->mutex);

	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);



/**

 * snd_soc_dapm_get_value_enum_double - dapm semi enumerated double mixer get

 *					callback