ASoC: dapm: Support second register for DAPM control updates

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>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index f60d755f7ac6c947ff5d6c817ae8ebce430f1224..d5f4677776ce532c38426a6752dde993529005d1 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -615,6 +615,10 @@ struct snd_soc_dapm_update {
        int reg;
        int mask;
        int val;
+       int reg2;
+       int mask2;
+       int val2;
+       bool has_second_set;
 };
 
 struct snd_soc_dapm_wcache {

diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c
index 439aa3ff1f99cd517f28988f80fe2b34c6489ab2..b36511d965c8202c547a9aaef2827273acc83c28 100644 (file)
--- a/sound/soc/codecs/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
@@ -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 adau *adau = snd_soc_codec_get_drvdata(codec);
        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 val, change;
        int reg;

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5a8d96ec058c5e5464a251d86edcc2920c5e14c7..8877b74b0510fedefe81adc6637c9d72cf9c722f 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -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 invert = mc->invert;
        unsigned short val;
-       struct snd_soc_dapm_update update;
+       struct snd_soc_dapm_update update = { 0 };
        int connect, change;
 
        val = (ucontrol->value.integer.value[0] & mask);

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 557709eac698fb60c6a66d5af9a88bf744e8256c..85f7c5bb8b825fbba0f14d6ed6f8753b454daaa7 100644 (file)
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -187,7 +187,7 @@ static int wm9712_hp_mixer_put(struct snd_kcontrol *kcontrol,
        struct soc_mixer_control *mc =
                (struct soc_mixer_control *)kcontrol->private_value;
        unsigned int mixer, mask, shift, old;
-       struct snd_soc_dapm_update update;
+       struct snd_soc_dapm_update update = { 0 };
        bool change;
 
        mixer = mc->shift >> 8;

diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index e4301ddb1b84e434ce3bbfa5997f20658af30dbd..7e4822185febeac4ae7d2d601f3a76c7659ff924 100644 (file)
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -231,7 +231,7 @@ static int wm9713_hp_mixer_put(struct snd_kcontrol *kcontrol,
        struct soc_mixer_control *mc =
                (struct soc_mixer_control *)kcontrol->private_value;
        unsigned int mixer, mask, shift, old;
-       struct snd_soc_dapm_update update;
+       struct snd_soc_dapm_update update = { 0 };
        bool change;
 
        mixer = mc->shift >> 8;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 3bbe32ee4630479ae55ea22f28690eef538aa75b..32e7af9b93d543c11abbc0178d862aa0a0cfda71 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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",
                        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++) {
                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 val;
        int connect, change, reg_change = 0;
-       struct snd_soc_dapm_update update;
+       struct snd_soc_dapm_update update = { NULL };
        int ret = 0;
 
        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 val, change, reg_change = 0;
        unsigned int mask;
-       struct snd_soc_dapm_update update;
+       struct snd_soc_dapm_update update = { NULL };
        int ret = 0;
 
        if (item[0] >= e->items)