Merge branch 'for-2.6.37' into for-2.6.38

[~andy/linux] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 275e411334686146236555b5b35f49b0459a3972..3eb92ef6c83f5de38d1a39eab524810fddd4a584 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -256,7 +256,9 @@ enum snd_soc_control_type {
 };
 
 enum snd_soc_compress_type {
-       SND_SOC_NO_COMPRESSION
+       SND_SOC_NO_COMPRESSION,
+       SND_SOC_LZO_COMPRESSION,
+       SND_SOC_RBTREE_COMPRESSION
 };
 
 int snd_soc_register_platform(struct device *dev,
@@ -448,6 +450,7 @@ struct snd_soc_cache_ops {
 /* SoC Audio Codec device */
 struct snd_soc_codec {
        const char *name;
+       const char *name_prefix;
        int id;
        struct device *dev;
        struct snd_soc_codec_driver *driver;
@@ -575,6 +578,11 @@ struct snd_soc_dai_link {
        struct snd_soc_ops *ops;
 };
 
+struct snd_soc_prefix_map {
+       const char *dev_name;
+       const char *name_prefix;
+};
+
 /* SoC card */
 struct snd_soc_card {
        const char *name;
@@ -609,6 +617,13 @@ struct snd_soc_card {
        struct snd_soc_pcm_runtime *rtd;
        int num_rtd;
 
+       /*
+        * optional map of kcontrol, widget and path name prefixes that are
+        * associated per device
+        */
+       struct snd_soc_prefix_map *prefix_map;
+       int num_prefixes;
+
        struct work_struct deferred_resume_work;
 
        /* lists of probed devices belonging to this card */