diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-13 19:03:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-13 19:03:48 +0100 |
| commit | c320106230c78b37c4bdbe6eafc636169e97bad9 (patch) | |
| tree | efec8d37b0917ecdc2b5268ea419341a20f11803 /include/sound | |
| parent | 5fdb83f190ee2218d113a46b190b70aa1c979325 (diff) | |
| parent | 56fe48976db38ed3984e0e68b71e503e8179dd89 (diff) | |
| download | talos-op-linux-c320106230c78b37c4bdbe6eafc636169e97bad9.tar.gz talos-op-linux-c320106230c78b37c4bdbe6eafc636169e97bad9.zip | |
Merge tag 'asoc-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
This is mostly a few additional fixes from Lars-Peter, a new driver and
cleaning up a git failure with merging the Intel branch (combined with
an xargs failure to pay attention to error codes). The history lists a
bunch of additional commits for the branch but the content of those
commits is actually present already but not recorded in history due to
git failing. Unfortunately xargs is used in the merge script and it
doesn't do a good job of noticing errors from the commands it invokes.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 959f38949967..f7de629728bf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -354,12 +354,6 @@ typedef int (*hw_write_t)(void *,const char* ,int); extern struct snd_ac97_bus_ops *soc_ac97_ops; -enum snd_soc_control_type { - SND_SOC_I2C = 1, - SND_SOC_SPI, - SND_SOC_REGMAP, -}; - enum snd_soc_pcm_subclass { SND_SOC_PCM_CLASS_PCM = 0, SND_SOC_PCM_CLASS_BE = 1, @@ -406,8 +400,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec, int snd_soc_codec_writable_register(struct snd_soc_codec *codec, unsigned int reg); int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, - int addr_bits, int data_bits, - enum snd_soc_control_type control); + struct regmap *regmap); int snd_soc_cache_sync(struct snd_soc_codec *codec); int snd_soc_cache_init(struct snd_soc_codec *codec); int snd_soc_cache_exit(struct snd_soc_codec *codec); @@ -614,7 +607,8 @@ struct snd_soc_jack_gpio { struct snd_soc_jack *jack; struct delayed_work work; - int (*jack_status_check)(void); + void *data; + int (*jack_status_check)(void *data); }; struct snd_soc_jack { @@ -717,7 +711,6 @@ struct snd_soc_codec { /* codec IO */ void *control_data; /* codec control (i2c/3wire) data */ hw_write_t hw_write; - unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int); unsigned int (*read)(struct snd_soc_codec *, unsigned int); int (*write)(struct snd_soc_codec *, unsigned int, unsigned int); void *reg_cache; |
