leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: dapm: Support second register for DAPM control updates

Browse Source 
To support double channel shared controls split across 2 registers, one
for each channel, we must be able to update both registers together.

Add a second set of register fields to struct snd_soc_dapm_update, and
update the DAPM control writeback (put) callbacks to support this.

For codecs that use custom events which call into DAPM to do updates,
also clear struct snd_soc_dapm_update before using it, so the second
set of fields remains clean.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Chen-Yu Tsai 2016-11-02 15:35:58 +08:00 committed by Mark Brown
parent 1001354ca3
commit e411b0b5eb
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sound/soc-dapm.h
View File

@ -615,6 +615,10 @@ struct snd_soc_dapm_update {
int reg; int reg;
int mask; int mask;
int val; int val;
int reg2;
int mask2;
int val2;
bool has_second_set;
}; };
struct snd_soc_dapm_wcache { struct snd_soc_dapm_wcache {

2
sound/soc/codecs/adau17x1.c
View File

@ -160,7 +160,7 @@ static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct adau *adau = snd_soc_codec_get_drvdata(codec); struct adau *adau = snd_soc_codec_get_drvdata(codec);
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { 0 };
unsigned int stream = e->shift_l; unsigned int stream = e->shift_l;
unsigned int val, change; unsigned int val, change;
int reg; int reg;

2
sound/soc/codecs/tlv320aic3x.c
View File

@ -157,7 +157,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
unsigned int mask = (1 << fls(max)) - 1; unsigned int mask = (1 << fls(max)) - 1;
unsigned int invert = mc->invert; unsigned int invert = mc->invert;
unsigned short val; unsigned short val;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { 0 };
int connect, change; int connect, change;
val = (ucontrol->value.integer.value[0] & mask); val = (ucontrol->value.integer.value[0] & mask);

2
sound/soc/codecs/wm9712.c
View File

@ -187,7 +187,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
unsigned int mixer, mask, shift, old; unsigned int mixer, mask, shift, old;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { 0 };
bool change; bool change;
mixer = mc->shift >> 8; mixer = mc->shift >> 8;

2
sound/soc/codecs/wm9713.c
View File

@ -231,7 +231,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
struct soc_mixer_control *mc = struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value; (struct soc_mixer_control *)kcontrol->private_value;
unsigned int mixer, mask, shift, old; unsigned int mixer, mask, shift, old;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { 0 };
bool change; bool change;
mixer = mc->shift >> 8; mixer = mc->shift >> 8;

13
sound/soc/soc-dapm.c
View File

@ -1626,6 +1626,15 @@ static void dapm_widget_update(struct snd_soc_card *card)
dev_err(w->dapm->dev, "ASoC: %s DAPM update failed: %d\n", dev_err(w->dapm->dev, "ASoC: %s DAPM update failed: %d\n",
w->name, ret); w->name, ret);
if (update->has_second_set) {
ret = soc_dapm_update_bits(w->dapm, update->reg2,
update->mask2, update->val2);
if (ret < 0)
dev_err(w->dapm->dev,
"ASoC: %s DAPM update failed: %d\n",
w->name, ret);
}
for (wi = 0; wi < wlist->num_widgets; wi++) { for (wi = 0; wi < wlist->num_widgets; wi++) {
w = wlist->widgets[wi]; w = wlist->widgets[wi];
@ -3084,7 +3093,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
unsigned int invert = mc->invert; unsigned int invert = mc->invert;
unsigned int val; unsigned int val;
int connect, change, reg_change = 0; int connect, change, reg_change = 0;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { NULL };
int ret = 0; int ret = 0;
if (snd_soc_volsw_is_stereo(mc)) if (snd_soc_volsw_is_stereo(mc))
@ -3192,7 +3201,7 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
unsigned int *item = ucontrol->value.enumerated.item; unsigned int *item = ucontrol->value.enumerated.item;
unsigned int val, change, reg_change = 0; unsigned int val, change, reg_change = 0;
unsigned int mask; unsigned int mask;
struct snd_soc_dapm_update update; struct snd_soc_dapm_update update = { NULL };
int ret = 0; int ret = 0;
if (item[0] >= e->items) if (item[0] >= e->items)