All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Daniel Baluta <daniel.baluta@nxp.com>
Cc: Mark Brown <broonie@kernel.org>,
	alsa-devel@alsa-project.org, lgirdwood@gmail.com,
	shengjiu.wang@nxp.com, patches@opensource.wolfsonmicro.com,
	linux-kernel@vger.kernel.org, tiwai@suse.com, broonie@kernel.org,
	viorel.suman@nxp.com, mihai.serban@nxp.com,
	ckeepax@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org
Subject: Applied "ASoC: codec: wm8960: Stop when a matching PLL freq is found" to the asoc tree
Date: Thu, 06 Apr 2017 19:55:20 +0100	[thread overview]
Message-ID: <E1cwCYy-0001lq-GL@debutante> (raw)
In-Reply-To: <1491479514-24862-2-git-send-email-daniel.baluta@nxp.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Daniel Baluta <daniel.baluta@nxp.com>
Cc: Mark Brown <broonie@kernel.org>,
	alsa-devel@alsa-project.org, lgirdwood@gmail.com,
	shengjiu.wang@nxp.com, patches@opensource.wolfsonmicro.com,
	linux-kernel@vger.kernel.org, tiwai@suse.combroonie@kernel.org,
	viorel.suman@nxp.com, mihai.serban@nxp.com,
	ckeepax@opensource.wolfsonmicro.comalsa-devel@alsa-project.org
Subject: Applied "ASoC: codec: wm8960: Stop when a matching PLL freq is found" to the asoc tree
Date: Thu, 06 Apr 2017 19:55:20 +0100	[thread overview]
Message-ID: <E1cwCYy-0001lq-GL@debutante> (raw)
In-Reply-To: <1491479514-24862-2-git-send-email-daniel.baluta@nxp.com>

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

  reply	other threads:[~2017-04-06 18:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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   ` Mark Brown [this message]
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 11:51 ` [PATCH 2/2] ASoC: codec: wm8960: Relax bit clock computation when using PLL Daniel Baluta
2017-04-06 11:51   ` Daniel Baluta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1cwCYy-0001lq-GL@debutante \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=ckeepax@opensource.wolfsonmicro.com \
    --cc=daniel.baluta@nxp.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mihai.serban@nxp.com \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=shengjiu.wang@nxp.com \
    --cc=tiwai@suse.com \
    --cc=viorel.suman@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.