xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32

Browse Source
This commit is contained in:
Mark Brown
2009-08-11 13:09:27 +01:00
parent 17244c24f9 a5479e389e
commit 1921bab217
5 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/wm9081.c
View File

@@ -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: