diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:18 +0100 |
| commit | 39e0a0ae6957a7eafcd3245f45f40bf822e49812 (patch) | |
| tree | bac0168f535ba57ea0a9804b458665d664581d0e /include | |
| parent | 0314f6947c5132c63413855c34d8cff22e95ae2b (diff) | |
| parent | 88c27465dc7e3f11c43de295f623c44f593a0912 (diff) | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index feb896815069..d22de9712c45 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -889,6 +889,18 @@ struct snd_soc_component { #endif }; +struct snd_soc_rtdcom_list { + struct snd_soc_component *component; + struct list_head list; /* rtd::component_list */ +}; +struct snd_soc_component* +snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, + const char *driver_name); +#define for_each_rtdcom(rtd, rtdcom) \ + list_for_each_entry(rtdcom, &(rtd)->component_list, list) +#define for_each_rtdcom_safe(rtd, rtdcom1, rtdcom2) \ + list_for_each_entry_safe(rtdcom1, rtdcom2, &(rtd)->component_list, list) + /* SoC Audio Codec device */ struct snd_soc_codec { struct device *dev; @@ -897,7 +909,6 @@ struct snd_soc_codec { struct list_head list; /* runtime */ - unsigned int cache_bypass:1; /* Suppress access to the cache */ unsigned int cache_init:1; /* codec cache has been initialized */ /* codec IO */ @@ -907,10 +918,6 @@ struct snd_soc_codec { /* component */ struct snd_soc_component component; - -#ifdef CONFIG_DEBUG_FS - struct dentry *debugfs_reg; -#endif }; /* codec driver */ @@ -1233,7 +1240,7 @@ struct snd_soc_pcm_runtime { struct snd_pcm *pcm; struct snd_compr *compr; struct snd_soc_codec *codec; - struct snd_soc_platform *platform; + struct snd_soc_platform *platform; /* will be removed */ struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; @@ -1243,11 +1250,11 @@ struct snd_soc_pcm_runtime { struct delayed_work delayed_work; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root; - struct dentry *debugfs_dpcm_state; #endif unsigned int num; /* 0-based and monotonic increasing */ struct list_head list; /* rtd list of the soc card */ + struct list_head component_list; /* list of connected components */ /* bit field */ unsigned int dev_registered:1; |