* [PATCH 0/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL @ 2017-04-06 11:51 ` Daniel Baluta 0 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, broonie, perex, tiwai, linux-kernel, patches, ckeepax, shengjiu.wang, viorel.suman, mihai.serban This is a follow up of patch series sent here: http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119517.html where only patch 1/2 was merged. In this new patch series, we fix a problem with patch already merged and then we relax bit clock computation when using PLL the same as we did in patch 2/2 of previous series. Daniel Baluta (2): ASoC: codec: wm8960: Stop when a matching PLL freq is found ASoC: codec: wm8960: Relax bit clock computation when using PLL sound/soc/codecs/wm8960.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL @ 2017-04-06 11:51 ` Daniel Baluta 0 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, shengjiu.wang, patches, linux-kernel, tiwai, broonie, viorel.suman, mihai.serban, ckeepax This is a follow up of patch series sent here: http://mailman.alsa-project.org/pipermail/alsa-devel/2017-April/119517.html where only patch 1/2 was merged. In this new patch series, we fix a problem with patch already merged and then we relax bit clock computation when using PLL the same as we did in patch 2/2 of previous series. Daniel Baluta (2): ASoC: codec: wm8960: Stop when a matching PLL freq is found ASoC: codec: wm8960: Relax bit clock computation when using PLL sound/soc/codecs/wm8960.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ASoC: codec: wm8960: Stop when a matching PLL freq is found 2017-04-06 11:51 ` Daniel Baluta @ 2017-04-06 11:51 ` Daniel Baluta -1 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, broonie, perex, tiwai, linux-kernel, patches, ckeepax, shengjiu.wang, viorel.suman, mihai.serban When a matching PLL freq is found, searching continues even this is not necessary. The problem was introduced with the following refactoring commit 84fdc00d519ffd ("ASoC: codec: wm9860: Refactor PLL out freq search) Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- sound/soc/codecs/wm8960.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 36c8454..ace69da 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -724,7 +724,11 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, break; } } + if (k != ARRAY_SIZE(bclk_divs)) + break; } + if (j != ARRAY_SIZE(dac_divs)) + break; } if (*bclk_idx != -1) -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] ASoC: codec: wm8960: Stop when a matching PLL freq is found @ 2017-04-06 11:51 ` Daniel Baluta 0 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, shengjiu.wang, patches, linux-kernel, tiwai, broonie, viorel.suman, mihai.serban, ckeepax When a matching PLL freq is found, searching continues even this is not necessary. The problem was introduced with the following refactoring commit 84fdc00d519ffd ("ASoC: codec: wm9860: Refactor PLL out freq search) Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- sound/soc/codecs/wm8960.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 36c8454..ace69da 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -724,7 +724,11 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, break; } } + if (k != ARRAY_SIZE(bclk_divs)) + break; } + if (j != ARRAY_SIZE(dac_divs)) + break; } if (*bclk_idx != -1) -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: codec: wm8960: Stop when a matching PLL freq is found" to the asoc tree 2017-04-06 11:51 ` Daniel Baluta @ 2017-04-06 18:55 ` Mark Brown -1 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2017-04-06 18:55 UTC (permalink / raw) To: Daniel Baluta Cc: Mark Brown, alsa-devel, lgirdwood, shengjiu.wang, patches, linux-kernel, tiwai, broonie, viorel.suman, mihai.serban, ckeepax, alsa-devel The patch ASoC: codec: wm8960: Stop when a matching PLL freq is found has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 303e8954af8daa087e4f42788672d280337071ab Mon Sep 17 00:00:00 2001 From: Daniel Baluta <daniel.baluta@nxp.com> Date: Thu, 6 Apr 2017 14:51:53 +0300 Subject: [PATCH] ASoC: codec: wm8960: Stop when a matching PLL freq is found When a matching PLL freq is found, searching continues even this is not necessary. The problem was introduced with the following refactoring commit 84fdc00d519ffd ("ASoC: codec: wm9860: Refactor PLL out freq search) Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/wm8960.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 36c84549da23..ace69da97cb8 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -724,7 +724,11 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, break; } } + if (k != ARRAY_SIZE(bclk_divs)) + break; } + if (j != ARRAY_SIZE(dac_divs)) + break; } if (*bclk_idx != -1) -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "ASoC: codec: wm8960: Stop when a matching PLL freq is found" to the asoc tree @ 2017-04-06 18:55 ` Mark Brown 0 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2017-04-06 18:55 UTC (permalink / raw) To: Daniel Baluta Cc: Mark Brown, alsa-devel, lgirdwood, shengjiu.wang, patches, linux-kernel, tiwai The patch ASoC: codec: wm8960: Stop when a matching PLL freq is found has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 303e8954af8daa087e4f42788672d280337071ab Mon Sep 17 00:00:00 2001 From: Daniel Baluta <daniel.baluta@nxp.com> Date: Thu, 6 Apr 2017 14:51:53 +0300 Subject: [PATCH] ASoC: codec: wm8960: Stop when a matching PLL freq is found When a matching PLL freq is found, searching continues even this is not necessary. The problem was introduced with the following refactoring commit 84fdc00d519ffd ("ASoC: codec: wm9860: Refactor PLL out freq search) Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/wm8960.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 36c84549da23..ace69da97cb8 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -724,7 +724,11 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, break; } } + if (k != ARRAY_SIZE(bclk_divs)) + break; } + if (j != ARRAY_SIZE(dac_divs)) + break; } if (*bclk_idx != -1) -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL 2017-04-06 11:51 ` Daniel Baluta @ 2017-04-06 11:51 ` Daniel Baluta -1 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, broonie, perex, tiwai, linux-kernel, patches, ckeepax, shengjiu.wang, viorel.suman, mihai.serban Bitclk is derived from sysclk using bclk_divs. Sysclk can be derived in two ways: (1) directly from MLCK (2) MCLK via PLL Commit 3c01b9ee2ab9d0d ("ASoC: codec: wm8960: Relax bit clock computation") relaxed bitclk computation when sysclk is directly derived from MCLK. Lets do the same thing when sysclk is derived via PLL. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8960.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index ace69da..8ab9fa2 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -679,6 +679,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, * - freq_out = sysclk * sysclk_divs * - 10 * sysclk = bclk * bclk_divs * + * If we cannot find an exact match for (sysclk, lrclk, bclk) + * triplet, we relax the bclk such that bclk is chosen as the + * closest available frequency greater than expected bclk. + * * @codec: codec structure * @freq_in: input frequency used to derive freq out via PLL * @sysclk_idx: sysclk_divs index for found sysclk @@ -696,13 +700,14 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, { struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); int sysclk, bclk, lrclk, freq_out; - int diff, best_freq_out; + int diff, closest, best_freq_out = 0; int i, j, k; bclk = wm8960->bclk; lrclk = wm8960->lrclk; + closest = freq_in; - *bclk_idx = -1; + *bclk_idx = *dac_idx = *sysclk_idx = -1; for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) { if (sysclk_divs[i] == -1) @@ -723,6 +728,13 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, best_freq_out = freq_out; break; } + if (diff > 0 && closest > diff) { + *sysclk_idx = i; + *dac_idx = j; + *bclk_idx = k; + closest = diff; + best_freq_out = freq_out; + } } if (k != ARRAY_SIZE(bclk_divs)) break; -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL @ 2017-04-06 11:51 ` Daniel Baluta 0 siblings, 0 replies; 8+ messages in thread From: Daniel Baluta @ 2017-04-06 11:51 UTC (permalink / raw) To: alsa-devel Cc: lgirdwood, broonie, perex, tiwai, linux-kernel, patches, ckeepax, shengjiu.wang, viorel.suman, mihai.serban Bitclk is derived from sysclk using bclk_divs. Sysclk can be derived in two ways: (1) directly from MLCK (2) MCLK via PLL Commit 3c01b9ee2ab9d0d ("ASoC: codec: wm8960: Relax bit clock computation") relaxed bitclk computation when sysclk is directly derived from MCLK. Lets do the same thing when sysclk is derived via PLL. Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8960.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index ace69da..8ab9fa2 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -679,6 +679,10 @@ int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk, * - freq_out = sysclk * sysclk_divs * - 10 * sysclk = bclk * bclk_divs * + * If we cannot find an exact match for (sysclk, lrclk, bclk) + * triplet, we relax the bclk such that bclk is chosen as the + * closest available frequency greater than expected bclk. + * * @codec: codec structure * @freq_in: input frequency used to derive freq out via PLL * @sysclk_idx: sysclk_divs index for found sysclk @@ -696,13 +700,14 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, { struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); int sysclk, bclk, lrclk, freq_out; - int diff, best_freq_out; + int diff, closest, best_freq_out = 0; int i, j, k; bclk = wm8960->bclk; lrclk = wm8960->lrclk; + closest = freq_in; - *bclk_idx = -1; + *bclk_idx = *dac_idx = *sysclk_idx = -1; for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) { if (sysclk_divs[i] == -1) @@ -723,6 +728,13 @@ int wm8960_configure_pll(struct snd_soc_codec *codec, int freq_in, best_freq_out = freq_out; break; } + if (diff > 0 && closest > diff) { + *sysclk_idx = i; + *dac_idx = j; + *bclk_idx = k; + closest = diff; + best_freq_out = freq_out; + } } if (k != ARRAY_SIZE(bclk_divs)) break; -- 2.7.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-06 18:55 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-04-06 11:51 [PATCH 0/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL Daniel Baluta 2017-04-06 11:51 ` Daniel Baluta 2017-04-06 11:51 ` [PATCH 1/2] ASoC: codec: wm8960: Stop when a matching PLL freq is found Daniel Baluta 2017-04-06 11:51 ` Daniel Baluta 2017-04-06 18:55 ` Applied "ASoC: codec: wm8960: Stop when a matching PLL freq is found" to the asoc tree Mark Brown 2017-04-06 18:55 ` Mark Brown 2017-04-06 11:51 ` [PATCH 2/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL Daniel Baluta 2017-04-06 11:51 ` Daniel Baluta
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.