aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-07 06:43:58 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-08-07 06:43:58 -0400
commit06cddefc1f25b847dafe392f3d5781482b3395b5 (patch)
tree97f4df2e4ae6a1e8194ca67ede1b552802ba2334 /include/sound
parentb9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f (diff)
parent27ded041f03026e8c6be9efc626e11ddfb4620c1 (diff)
Merge branch 'reg-cache' into for-2.6.32
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 55b330937260..dbb1702688cd 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -209,11 +209,20 @@ typedef int (*hw_read_t)(void *,char* ,int);
209 209
210extern struct snd_ac97_bus_ops soc_ac97_ops; 210extern struct snd_ac97_bus_ops soc_ac97_ops;
211 211
212enum snd_soc_control_type {
213 SND_SOC_CUSTOM,
214 SND_SOC_I2C,
215 SND_SOC_SPI,
216};
217
212int snd_soc_register_platform(struct snd_soc_platform *platform); 218int snd_soc_register_platform(struct snd_soc_platform *platform);
213void snd_soc_unregister_platform(struct snd_soc_platform *platform); 219void snd_soc_unregister_platform(struct snd_soc_platform *platform);
214int snd_soc_register_codec(struct snd_soc_codec *codec); 220int snd_soc_register_codec(struct snd_soc_codec *codec);
215void snd_soc_unregister_codec(struct snd_soc_codec *codec); 221void snd_soc_unregister_codec(struct snd_soc_codec *codec);
216int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg); 222int snd_soc_codec_volatile_register(struct snd_soc_codec *codec, int reg);
223int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
224 int addr_bits, int data_bits,
225 enum snd_soc_control_type control);
217 226
218#ifdef CONFIG_PM 227#ifdef CONFIG_PM
219int snd_soc_suspend_device(struct device *dev); 228int snd_soc_suspend_device(struct device *dev);
@@ -387,7 +396,7 @@ struct snd_soc_codec {
387 int (*volatile_register)(unsigned int); 396 int (*volatile_register)(unsigned int);
388 int (*readable_register)(unsigned int); 397 int (*readable_register)(unsigned int);
389 hw_write_t hw_write; 398 hw_write_t hw_write;
390 hw_read_t hw_read; 399 unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
391 void *reg_cache; 400 void *reg_cache;
392 short reg_cache_size; 401 short reg_cache_size;
393 short reg_cache_step; 402 short reg_cache_step;