diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-06 14:18:39 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:00:51 +0100 |
| commit | e8236d1e6e4ee6e786dddcc332b3d01c43d58938 (patch) | |
| tree | 0dd31381cf7f80dded79fa54d9541b2917d8e61c /sound/soc/codecs/ab8500_audio.h | |
| parent | c8eaa0393187c4d88a13cfe1c3cc82467aeeed46 (diff) | |
Ux500 ASoC: Support configuration of I2S interface 1
Added support for configuring the second I2S interface.
This is needed for FM-radio.
Change-Id: I1a8cd908f66db45b6031d15d33779236a1a55344
Signed-off-by: Ola Lilja <elilola@steludxu2785.(none)>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19821
Tested-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Conflicts:
sound/soc/codecs/ab8500_audio.c
Diffstat (limited to 'sound/soc/codecs/ab8500_audio.h')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/sound/soc/codecs/ab8500_audio.h b/sound/soc/codecs/ab8500_audio.h index 66c481cf411..6946e25bc4d 100644 --- a/sound/soc/codecs/ab8500_audio.h +++ b/sound/soc/codecs/ab8500_audio.h @@ -15,16 +15,19 @@ #ifndef AB8500_CODEC_REGISTERS_H #define AB8500_CODEC_REGISTERS_H -extern struct snd_soc_dai_driver ab8500_codec_dai[]; -extern struct snd_soc_codec_driver soc_codec_dev_ab8500; - #define AB8500_SUPPORTED_RATE (SNDRV_PCM_RATE_48000) - #define AB8500_SUPPORTED_FMT (SNDRV_PCM_FMTBIT_S16_LE) +extern struct snd_soc_dai_driver ab8500_codec_dai[]; +extern struct snd_soc_codec_driver soc_codec_dev_ab8500; + /* Extended interface for codec-driver */ int ab8500_audio_set_word_length(struct snd_soc_dai *dai, unsigned int wl); int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai, unsigned int delay); +int ab8500_audio_setup_if1(struct snd_soc_codec *codec, + unsigned int fmt, + unsigned int wl, + unsigned int delay); /* AB8500 audio bank (0x0d) register definitions */ @@ -322,6 +325,13 @@ int ab8500_audio_set_bit_delay(struct snd_soc_dai *dai, unsigned int delay); #define REG_DIGIFCONF3_IF0BFIFOEN 0 /* REG_DIGIFCONF4 */ +#define REG_DIGIFCONF4_FSYNC1P 6 +#define REG_DIGIFCONF4_BITCLK1P 5 +#define REG_DIGIFCONF4_IF1DEL 4 +#define REG_DIGIFCONF4_IF1FORMAT1 3 +#define REG_DIGIFCONF4_IF1FORMAT0 2 +#define REG_DIGIFCONF4_IF1WL1 1 +#define REG_DIGIFCONF4_IF1WL0 0 /* REG_ADSLOTSELX */ #define REG_ADSLOTSELX_ODDX_3 7 |