diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-05 08:20:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-05 08:20:19 +0200 |
| commit | f187700c2d769bd3160b52f99cc4e747d5c5014b (patch) | |
| tree | ef4abc21683423fa4a6405b954d06743ddbda24a /include | |
| parent | 56aa53391059e3730a304da4dd96b7b123b9fb75 (diff) | |
| parent | f1442bc1e9bd5ff4c2470d66075d066e535a2c86 (diff) | |
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6424b10ac29c..f30f3fe4a41b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -312,6 +312,10 @@ int snd_soc_default_readable_register(struct snd_soc_codec *codec, unsigned int reg); int snd_soc_default_writable_register(struct snd_soc_codec *codec, unsigned int reg); +int snd_soc_platform_read(struct snd_soc_platform *platform, + unsigned int reg); +int snd_soc_platform_write(struct snd_soc_platform *platform, + unsigned int reg, unsigned int val); /* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); @@ -658,6 +662,10 @@ struct snd_soc_platform_driver { /* probe ordering - for components with runtime dependencies */ int probe_order; int remove_order; + + /* platform IO - used for platform DAPM */ + unsigned int (*read)(struct snd_soc_platform *, unsigned int); + int (*write)(struct snd_soc_platform *, unsigned int, unsigned int); }; struct snd_soc_platform { |