Unverified Commit df4d27b1 authored by Martin Povišer's avatar Martin Povišer Committed by Mark Brown
Browse files

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: default avatarMartin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220606191910.16580-5-povik+lin@cutebit.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 142d4562

include/sound/soc-card.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/soc-card.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/soc-core.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {