diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 15:19:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 15:19:21 +0100 |
| commit | 2620954d64f6f067b785faf03738b637f3473ca7 (patch) | |
| tree | 00c5281e4acabc56ac1cd215a63963d956b09879 /include/sound/soc.h | |
| parent | Merge remote-tracking branch 'asoc/topic/intel' into asoc-next (diff) | |
| parent | ASoC: core: Fix check before setting default I/O up try regmap (diff) | |
| download | linux-2620954d64f6f067b785faf03738b637f3473ca7.tar.xz linux-2620954d64f6f067b785faf03738b637f3473ca7.zip | |
Merge remote-tracking branch 'asoc/topic/io' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 959f38949967..59b2a6a6e27c 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); @@ -717,7 +710,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; |