diff options
author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2015-05-29 19:06:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-04 09:40:03 +0100 |
commit | 8a9782346dccd82cf912552735bda619de4efd8c (patch) | |
tree | 233bc05d70fbd10c65affe8110da5ef916548962 /include/sound/soc.h | |
parent | c147c0e17b532a0d35ab92c86bbce0dfe1c1aaf4 (diff) | |
download | op-kernel-dev-8a9782346dccd82cf912552735bda619de4efd8c.zip op-kernel-dev-8a9782346dccd82cf912552735bda619de4efd8c.tar.gz |
ASoC: topology: Add topology core
The topology core parses the FW topology file for known block types and
instanciates any common ALSA/ASoC objects that it discovers. The core
also passes any block that is does not understand to client component
drivers for enumeration.
The core exports some APIs to client drivers in order to load and unload
firmware topology data as use case require.
Currently the core deals with the following object types :-
o kcontrols. This includes TLV, enumerated and bytes controls.
o DAPM widgets. All types with any associated kcontrol.
o DAPM graph.
o FE PCM. FE PCM capabilities and configuration can be defined.
o BE DAI Link. BE DAI link capabilities and configuration can be defined.
o Codec <-> codec style links capabilities and configuration.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r-- | include/sound/soc.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 2f2e59e..bfd84a7 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -27,6 +27,7 @@ #include <sound/compress_driver.h> #include <sound/control.h> #include <sound/ac97_codec.h> +#include <sound/soc-topology.h> /* * Convenience kcontrol builders @@ -764,6 +765,9 @@ struct snd_soc_component { struct mutex io_mutex; + /* attached dynamic objects */ + struct list_head dobj_list; + #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_root; #endif @@ -1108,6 +1112,9 @@ struct snd_soc_card { struct list_head dapm_list; struct list_head dapm_dirty; + /* attached dynamic objects */ + struct list_head dobj_list; + /* Generic DAPM context for the card */ struct snd_soc_dapm_context dapm; struct snd_soc_dapm_stats dapm_stats; @@ -1167,6 +1174,7 @@ struct soc_mixer_control { unsigned int sign_bit; unsigned int invert:1; unsigned int autodisable:1; + struct snd_soc_dobj dobj; }; struct soc_bytes { @@ -1177,6 +1185,8 @@ struct soc_bytes { struct soc_bytes_ext { int max; + struct snd_soc_dobj dobj; + /* used for TLV byte control */ int (*get)(unsigned int __user *bytes, unsigned int size); int (*put)(const unsigned int __user *bytes, unsigned int size); @@ -1198,6 +1208,7 @@ struct soc_enum { const char * const *texts; const unsigned int *values; unsigned int autodisable:1; + struct snd_soc_dobj dobj; }; /** |