ASoC: Introduce 'fixup_controls' card method

The new method is called just before the card is registered, providing
an opportune time for machine-level drivers to do some final controls
amending: deactivating individual controls or obtaining control
references for later use.

Some controls can be created by DAPM after 'late_probe' has been called,
hence the need for this new method.

Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220606191910.16580-5-povik+lin@cutebit.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-card.h b/include/sound/soc-card.h
index df08573bd80cdc7f7664df56b352ffadac3024df..9d31a5c0db33c2ff36a18b8629430c218884e889 100644 (file)
--- a/include/sound/soc-card.h
+++ b/include/sound/soc-card.h
@@ -29,6 +29,7 @@ int snd_soc_card_resume_post(struct snd_soc_card *card);
 
 int snd_soc_card_probe(struct snd_soc_card *card);
 int snd_soc_card_late_probe(struct snd_soc_card *card);
+void snd_soc_card_fixup_controls(struct snd_soc_card *card);
 int snd_soc_card_remove(struct snd_soc_card *card);
 
 int snd_soc_card_set_bias_level(struct snd_soc_card *card,

diff --git a/include/sound/soc.h b/include/sound/soc.h
index f20f5f890794ab8b051b8cb7c5c7a16ce0b6afce..faef85e37e32019e29c2e51a34fd4e4531a1b12b 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -916,6 +916,7 @@ struct snd_soc_card {
 
        int (*probe)(struct snd_soc_card *card);
        int (*late_probe)(struct snd_soc_card *card);
+       void (*fixup_controls)(struct snd_soc_card *card);
        int (*remove)(struct snd_soc_card *card);
 
        /* the pre and post PM functions are used to do any PM work before and

diff --git a/sound/soc/soc-card.c b/sound/soc/soc-card.c
index 4158f5aacfd373a95e9d03f6f2700d50acd635dc..285ab4c9c7168314ae34bead44a5229bc5d8b96b 100644 (file)
--- a/sound/soc/soc-card.c
+++ b/sound/soc/soc-card.c
@@ -197,6 +197,12 @@ int snd_soc_card_late_probe(struct snd_soc_card *card)
        return 0;
 }
 
+void snd_soc_card_fixup_controls(struct snd_soc_card *card)
+{
+       if (card->fixup_controls)
+               card->fixup_controls(card);
+}
+
 int snd_soc_card_remove(struct snd_soc_card *card)
 {
        int ret = 0;

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 227540851dedff8989b685a2b3d47f3603c71b6a..57f7105c12b76c5b6eb0065556171cd36691424e 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2066,6 +2066,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
                goto probe_end;
 
        snd_soc_dapm_new_widgets(card);
+       snd_soc_card_fixup_controls(card);
 
        ret = snd_card_register(card->snd_card);
        if (ret < 0) {