Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: wm8960: Clocking tweaks

Merge series from Mark Brown <broonie@kernel.org>:

A couple of minor clocking improvements that make the wm8960 driver work
a bit better with generic cards.

+10 -2
+8
sound/soc/codecs/wm8960.c
··· 1429 1429 if (IS_ERR(wm8960->mclk)) { 1430 1430 if (PTR_ERR(wm8960->mclk) == -EPROBE_DEFER) 1431 1431 return -EPROBE_DEFER; 1432 + } else { 1433 + ret = clk_get_rate(wm8960->mclk); 1434 + if (ret >= 0) { 1435 + wm8960->freq_in = ret; 1436 + } else { 1437 + dev_err(&i2c->dev, "Failed to read MCLK rate: %d\n", 1438 + ret); 1439 + } 1432 1440 } 1433 1441 1434 1442 wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap);
+2 -2
sound/soc/codecs/wm8960.h
··· 77 77 #define WM8960_SYSCLK_DIV_1 (0 << 1) 78 78 #define WM8960_SYSCLK_DIV_2 (2 << 1) 79 79 80 - #define WM8960_SYSCLK_MCLK (0 << 0) 80 + #define WM8960_SYSCLK_AUTO (0 << 0) 81 81 #define WM8960_SYSCLK_PLL (1 << 0) 82 - #define WM8960_SYSCLK_AUTO (2 << 0) 82 + #define WM8960_SYSCLK_MCLK (2 << 0) 83 83 84 84 #define WM8960_DAC_DIV_1 (0 << 3) 85 85 #define WM8960_DAC_DIV_1_5 (1 << 3)