diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-11 13:09:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-11 13:09:27 +0100 |
| commit | 1921bab217c2c21e4b8dc78332f6ae11515fc014 (patch) | |
| tree | 0577922c34d491b34c6a5aa47dab950c073ada12 /sound/soc/codecs | |
| parent | ASoC: fix I2C build errors (diff) | |
| parent | ASoC: change set_tdm_slot api to allow slot_width override. (diff) | |
| download | linux-dev-1921bab217c2c21e4b8dc78332f6ae11515fc014.tar.xz linux-dev-1921bab217c2c21e4b8dc78332f6ae11515fc014.zip | |
Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/wm9081.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 1f51dd542a46..c147f2b8723d 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1149,8 +1149,9 @@ static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai, return 0; } +/* FIXME: Needs to handle slot_width */ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots) + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { struct snd_soc_codec *codec = dai->codec; unsigned int aif1 = snd_soc_read(codec, WM9081_AUDIO_INTERFACE_1); @@ -1162,7 +1163,7 @@ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, aif1 |= (slots - 1) << WM9081_AIFDAC_TDM_MODE_SHIFT; - switch (mask) { + switch (rx_mask) { case 1: break; case 2: |