Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
f04b8d6ece
1 changed files with 1 additions and 0 deletions
|
@ -2043,6 +2043,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai,
|
||||||
break;
|
break;
|
||||||
case 24576000:
|
case 24576000:
|
||||||
ratediv = WM8996_SYSCLK_DIV;
|
ratediv = WM8996_SYSCLK_DIV;
|
||||||
|
wm8996->sysclk /= 2;
|
||||||
case 12288000:
|
case 12288000:
|
||||||
snd_soc_update_bits(codec, WM8996_AIF_RATE,
|
snd_soc_update_bits(codec, WM8996_AIF_RATE,
|
||||||
WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);
|
WM8996_SYSCLK_RATE, WM8996_SYSCLK_RATE);
|
||||||
|
|
Reference in a new issue