diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-02 15:06:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-02 15:06:45 +0200 |
| commit | c8ead4154af3d43635f63a708a2f369c7cce09e7 (patch) | |
| tree | 42a96351bbee7996826d1126a85351e42a22dd87 /include | |
| parent | 18e391862cceaf43ddb8eb5cca05e1a83abdebaa (diff) | |
| parent | 5df498a27ab385294fdb7cad19c623d4da94a780 (diff) | |
| download | cachepc-linux-c8ead4154af3d43635f63a708a2f369c7cce09e7.tar.gz cachepc-linux-c8ead4154af3d43635f63a708a2f369c7cce09e7.zip | |
Merge tag 'asoc-v3.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.12
A few final updates for v3.12 - some cleanups, a bug fix for ssm2602,
pop removal for rt5640 and fixes for the reporting of unidirectional
links in the MXS SGTL5000 driver.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 8e2ad52078b6..d22cb0a06feb 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -697,7 +697,6 @@ struct snd_soc_codec { unsigned int probed:1; /* Codec has been probed */ unsigned int ac97_registered:1; /* Codec has been AC97 registered */ unsigned int ac97_created:1; /* Codec has been created by SoC */ - unsigned int sysfs_registered:1; /* codec has been sysfs registered */ unsigned int cache_init:1; /* codec cache has been initialized */ unsigned int using_regmap:1; /* using regmap access */ u32 cache_only; /* Suppress writes to hardware */ @@ -705,7 +704,6 @@ struct snd_soc_codec { /* codec IO */ void *control_data; /* codec control (i2c/3wire) data */ - enum snd_soc_control_type control_type; hw_write_t hw_write; unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int); unsigned int (*read)(struct snd_soc_codec *, unsigned int); @@ -724,7 +722,6 @@ struct snd_soc_codec { #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_codec_root; struct dentry *debugfs_reg; - struct dentry *debugfs_dapm; #endif }; @@ -849,7 +846,6 @@ struct snd_soc_platform { #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_platform_root; - struct dentry *debugfs_dapm; #endif }; @@ -934,6 +930,10 @@ struct snd_soc_dai_link { /* machine stream operations */ const struct snd_soc_ops *ops; const struct snd_soc_compr_ops *compr_ops; + + /* For unidirectional dai links */ + bool playback_only; + bool capture_only; }; struct snd_soc_codec_conf { |