diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-06-16 12:13:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-21 16:34:15 -0400 |
commit | ce0fc93ae56e2ba50ff8c220d69e4e860e889320 (patch) | |
tree | b444788c95c34b08a18f80f00a411f359aa8ce23 /include/sound/soc-dapm.h | |
parent | 68f831c2724ab72c0088471b2ed1dc99e81948ef (diff) |
ASoC: Add DAPM support at the component level
This patch adds full DAPM support at the component level. Previously there was
only full DAPM support for CODECs and partial DAPM support (e.g. no Mixers nor
MUXs) for platforms. Having DAPM support at the component level will allow all
types of components to use DAPM and also help in consolidating the DAPM support
between CODECs and platforms.
Since the DAPM context is directly embedded into the snd_soc_codec and
snd_soc_platform struct and the 'dapm' field is directly referenced in a lot of
drivers moving the field just right now is not possible without causing code
churn. The approach this patch takes is to add two new fields to the component
struct. One field which is the pointer to the actual DAPM context used by the
component and one DAPM context that will be used as the default if no other
context was specified. For CODECs and platforms the pointer is initialized to
point to the CODEC or platform DAPM context. All generic code when referencing
a component's DAPM struct will go via the pointer. This will make it possible to
eventually seamlessly move the DAPM context from snd_soc_codec and
snd_soc_platform struct over once all direct references have been eliminated.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 3a5c4f969c04..e292683ee694 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -441,6 +441,8 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, | |||
441 | struct snd_soc_dapm_widget_list **list); | 441 | struct snd_soc_dapm_widget_list **list); |
442 | 442 | ||
443 | struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol); | 443 | struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol); |
444 | struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( | ||
445 | struct snd_kcontrol *kcontrol); | ||
444 | 446 | ||
445 | /* dapm widget types */ | 447 | /* dapm widget types */ |
446 | enum snd_soc_dapm_type { | 448 | enum snd_soc_dapm_type { |