summaryrefslogtreecommitdiff
path: root/sound/soc/davinci/davinci-mcasp.h
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-12-05 18:20:37 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-07 14:47:01 +0900
commitba764b3def0b979fd22884779f1a02f701e3af72 (patch)
tree52e17dfa2480c5056866b88fbdc300b61405aed2 /sound/soc/davinci/davinci-mcasp.h
parentd0c6c482f6d8c2145717ab0266c87e3e792527ef (diff)
downloadlinux-ba764b3def0b979fd22884779f1a02f701e3af72.tar.gz
ASoC: McASP: calculate values for channel size
Change davinci_config_channel_size() to derive the values for XSSZ and XROT in DAVINCI_MCASP_[RT]XFMT_REG from the configured word length rather than hard-coding them in a switch/case block. Also, by directly passing the word length to davinci_config_channel_size(), we can get rid of the DAVINCI_AUDIO_WORD_* enum. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/davinci/davinci-mcasp.h')
-rw-r--r--sound/soc/davinci/davinci-mcasp.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index a42b5d96739f..d2449a865fc2 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -27,16 +27,6 @@
#define DAVINCI_MCASP_I2S_DAI 0
#define DAVINCI_MCASP_DIT_DAI 1
-enum {
- DAVINCI_AUDIO_WORD_8 = 0,
- DAVINCI_AUDIO_WORD_12,
- DAVINCI_AUDIO_WORD_16,
- DAVINCI_AUDIO_WORD_20,
- DAVINCI_AUDIO_WORD_24,
- DAVINCI_AUDIO_WORD_32,
- DAVINCI_AUDIO_WORD_28, /* This is only valid for McASP */
-};
-
struct davinci_audio_dev {
struct davinci_pcm_dma_params dma_params[2];
void __iomem *base;