Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next

This commit is contained in:
Mark Brown 2013-11-08 10:43:41 +00:00
Родитель 108145a606 c36c89096c
Коммит a941145d2b
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -794,11 +794,11 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source,
wm0010->max_spi_freq = 0; wm0010->max_spi_freq = 0;
} else { } else {
for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++) for (i = 0; i < ARRAY_SIZE(pll_clock_map); i++)
if (freq >= pll_clock_map[i].max_sysclk) if (freq >= pll_clock_map[i].max_sysclk) {
wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
break; break;
}
wm0010->max_spi_freq = pll_clock_map[i].max_pll_spi_speed;
wm0010->pll_clkctrl1 = pll_clock_map[i].pll_clkctrl1;
} }
return 0; return 0;