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

Commit e2be2ccf authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Jaroslav Kysela
Browse files

ALSA: ASoC: Add support for generic DAPM register modifier widget 



This generic register modifier widget is for updating multiple codec
register bits at once when the widget changes its power state.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: default avatarLiam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent a5c95e90

include/sound/soc-dapm.h

+14 −0
Original line number Diff line number Diff line
@@ -130,6 +130,13 @@ 
{	.id = snd_soc_dapm_adc, .name = wname, .sname = stname, .reg = wreg, \

	.shift = wshift, .invert = winvert}



/* generic register modifier widget */

#define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \

{	.id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \

	.reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \

	.on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \

	.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}



/* dapm kcontrol types */

#define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -227,6 +234,10 @@ int snd_soc_dapm_set_bias_level(struct snd_soc_device *socdev, 
/* dapm sys fs - used by the core */

int snd_soc_dapm_sys_add(struct device *dev);



/* event handler for register modifier widget - used by the soc-dapm */

int dapm_reg_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event);



/* dapm audio endpoint control */

int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,

	char *pin, int status);
@@ -298,6 +309,9 @@ struct snd_soc_dapm_widget { 
	unsigned char shift;			/* bits to shift */

	unsigned int saved_value;		/* widget saved value */

	unsigned int value;				/* widget current value */

	unsigned int mask;			/* non-shifted mask */

	unsigned int on_val;			/* on state value */

	unsigned int off_val;			/* off state value */

	unsigned char power:1;			/* block power status */

	unsigned char invert:1;			/* invert the power bit */

	unsigned char active:1;			/* active stream on DAC, ADC's */

sound/soc/soc-dapm.c

+19 −0
Original line number Diff line number Diff line
@@ -442,6 +442,25 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget) 
	return con;

}



/*

 * Handler for generic register modifier widget.

 */

int dapm_reg_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event)

{

	unsigned int val;



	if (SND_SOC_DAPM_EVENT_ON(event))

		val = w->on_val;

	else

		val = w->off_val;



	snd_soc_update_bits(w->codec, -(w->reg + 1),

			    w->mask << w->shift, val << w->shift);



	return 0;

}



/*

 * Scan each dapm widget for complete audio path.

 * A complete path is a route that has valid endpoints i.e.:-