forked from luck/tmp_suning_uos_patched
ASoC: Add data based control initialisation for CODECs and cards
Allow CODEC and card drivers to point to an array of controls from their driver structure rather than explicitly calling snd_soc_add_controls(). Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
d9b3e4c515
commit
b7af1dafdf
@ -577,7 +577,9 @@ struct snd_soc_codec_driver {
|
||||
pm_message_t state);
|
||||
int (*resume)(struct snd_soc_codec *);
|
||||
|
||||
/* Default DAPM setup, added after probe() is run */
|
||||
/* Default control and setup, added after probe() is run */
|
||||
const struct snd_kcontrol_new *controls;
|
||||
int num_controls;
|
||||
const struct snd_soc_dapm_widget *dapm_widgets;
|
||||
int num_dapm_widgets;
|
||||
const struct snd_soc_dapm_route *dapm_routes;
|
||||
@ -747,6 +749,9 @@ struct snd_soc_card {
|
||||
struct snd_soc_pcm_runtime *rtd_aux;
|
||||
int num_aux_rtd;
|
||||
|
||||
const struct snd_kcontrol_new *controls;
|
||||
int num_controls;
|
||||
|
||||
/*
|
||||
* Card-specific routes and widgets.
|
||||
*/
|
||||
|
@ -1493,6 +1493,9 @@ static int soc_probe_codec(struct snd_soc_card *card,
|
||||
}
|
||||
}
|
||||
|
||||
if (driver->controls)
|
||||
snd_soc_add_controls(codec, driver->controls,
|
||||
driver->num_controls);
|
||||
if (driver->dapm_widgets)
|
||||
snd_soc_dapm_new_controls(&codec->dapm, driver->dapm_widgets,
|
||||
driver->num_dapm_widgets);
|
||||
@ -1890,6 +1893,14 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
|
||||
}
|
||||
}
|
||||
|
||||
/* We should have a non-codec control add function but we don't */
|
||||
if (card->controls)
|
||||
snd_soc_add_controls(list_first_entry(&card->codec_dev_list,
|
||||
struct snd_soc_codec,
|
||||
card_list),
|
||||
card->controls,
|
||||
card->num_controls);
|
||||
|
||||
if (card->dapm_widgets)
|
||||
snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
|
||||
card->num_dapm_widgets);
|
||||
|
Loading…
Reference in New Issue
Block a user