[alsa-devel] [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com --- Changes since v1 : Removed unusual repeat for amp software reset and verification. Amp software reset will be performed once and it repeats verification maximum 3 times if it is failed. Wait 10ms before every verification trial. Maximum 30ms delay will be applied to wait AMP idle state.
Changes : Created max98373_reset function to minimize code duplication. Changed regmap_write to regmap_update_bits. Other bits except LSB need to be masked. Added reset verification step to make sure software reset is completed well. Software reset is done in 10ms in normal case. Revision ID is available when the amp is in the idle state which means software reset is completed. Software reset will be performed maximum 3 times to avoid amp reset failure. Generally it is done in the first trial. sleep time after software reset is increased + 30ms for every retrial. Maximum possible msleep time is 100 ms (initial 10 ms + 30 ms * 3 times).
sound/soc/codecs/max98373.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/max98373.c b/sound/soc/codecs/max98373.c index a09d013..9c8616a 100644 --- a/sound/soc/codecs/max98373.c +++ b/sound/soc/codecs/max98373.c @@ -724,14 +724,39 @@ static struct snd_soc_dai_driver max98373_dai[] = { } };
+static void max98373_reset(struct max98373_priv *max98373, struct device *dev) +{ + int ret, reg, count; + + /* Software Reset */ + ret = regmap_update_bits(max98373->regmap, + MAX98373_R2000_SW_RESET, + MAX98373_SOFT_RESET, + MAX98373_SOFT_RESET); + if (ret) + dev_err(dev, "Reset command failed. (ret:%d)\n", ret); + + count = 0; + while (count < 3) { + usleep_range(10000, 11000); + /* Software Reset Verification */ + ret = regmap_read(max98373->regmap, + MAX98373_R21FF_REV_ID, ®); + if (!ret) { + dev_info(dev, "Reset completed (retry:%d)\n", count); + return; + } + count++; + } + dev_err(dev, "Reset failed. (ret:%d)\n", ret); +} + static int max98373_probe(struct snd_soc_component *component) { struct max98373_priv *max98373 = snd_soc_component_get_drvdata(component);
/* Software Reset */ - regmap_write(max98373->regmap, - MAX98373_R2000_SW_RESET, MAX98373_SOFT_RESET); - usleep_range(10000, 11000); + max98373_reset(max98373, component->dev);
/* IV default slot configuration */ regmap_write(max98373->regmap, @@ -818,9 +843,7 @@ static int max98373_resume(struct device *dev) { struct max98373_priv *max98373 = dev_get_drvdata(dev);
- regmap_write(max98373->regmap, - MAX98373_R2000_SW_RESET, MAX98373_SOFT_RESET); - usleep_range(10000, 11000); + max98373_reset(max98373, dev); regcache_cache_only(max98373->regmap, false); regcache_sync(max98373->regmap); return 0;
On Wed, Nov 28, 2018 at 03:20:16AM +0000, Ryan Lee wrote:
Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com
Not seeing a changelog here like I asked for :(
Changes : Created max98373_reset function to minimize code duplication. Changed regmap_write to regmap_update_bits. Other bits except LSB need to be masked. Added reset verification step to make sure software reset is completed well. Software reset is done in 10ms in normal case. Revision ID is available when the amp is in the idle state which means software reset is completed. Software reset will be performed maximum 3 times to avoid amp reset failure. Generally it is done in the first trial. sleep time after software reset is increased + 30ms for every retrial. Maximum possible msleep time is 100 ms (initial 10 ms + 30 ms * 3 times).
This looks like it's supposed to be a changelog but it isn't one?
-----Original Message----- From: Mark Brown broonie@kernel.org Sent: Wednesday, November 28, 2018 1:50 AM To: Ryan Lee RyanS.Lee@maximintegrated.com Cc: Liam Girdwood lgirdwood@gmail.com; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Grant Grundler grundler@chromium.org; Kuninori Morimoto kuninori.morimoto.gx@renesas.com; Benson Leung bleung@chromium.org; alsa-devel@alsa-project.org; linux- kernel@vger.kernel.org; ryan.lee.maxim@gmail.com Subject: Re: [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
On Wed, Nov 28, 2018 at 03:20:16AM +0000, Ryan Lee wrote:
Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com
Not seeing a changelog here like I asked for :(
Actually I added changelog as below. Do you mean this is not sufficient?
Changes since v1 : Removed unusual repeat for amp software reset and verification. Amp software reset will be performed once and it repeats verification maximum 3 times if it is failed. Wait 10ms before every verification trial. Maximum 30ms delay will be applied to wait AMP idle state.
Changes : Created max98373_reset function to minimize code duplication. Changed regmap_write to regmap_update_bits. Other bits except LSB
need to be masked.
Added reset verification step to make sure software reset is completedwell. Software reset is done in 10ms in normal case.
Revision ID is available when the amp is in the idle state which meanssoftware reset is completed.
Software reset will be performed maximum 3 times to avoid amp resetfailure. Generally it is done in the first trial.
sleep time after software reset is increased + 30ms for every retrial.Maximum possible msleep time is 100 ms (initial 10 ms + 30 ms * 3 times).
This looks like it's supposed to be a changelog but it isn't one?
On Wed, Nov 28, 2018 at 9:07 AM Ryan Lee RyanS.Lee@maximintegrated.com wrote:
-----Original Message----- From: Mark Brown broonie@kernel.org Sent: Wednesday, November 28, 2018 1:50 AM To: Ryan Lee RyanS.Lee@maximintegrated.com Cc: Liam Girdwood lgirdwood@gmail.com; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Grant Grundler grundler@chromium.org; Kuninori Morimoto kuninori.morimoto.gx@renesas.com; Benson Leung bleung@chromium.org; alsa-devel@alsa-project.org; linux- kernel@vger.kernel.org; ryan.lee.maxim@gmail.com Subject: Re: [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
On Wed, Nov 28, 2018 at 03:20:16AM +0000, Ryan Lee wrote:
Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com
Not seeing a changelog here like I asked for :(
Actually I added changelog as below. Do you mean this is not sufficient?
The text is probably sufficient but not in a format that Mark can directly apply. Please take a quick look at Documentation/process/submitting-patches.rst.
Mark wants the "commit message" to be before the '---' line. So move the "Changes:" text up to become the commit message and drop the "Changes" line. That should explain why this commit is needed and include the S-o-B line.
cheers, grant
Changes since v1 : Removed unusual repeat for amp software reset and verification. Amp software reset will be performed once and it repeats verification maximum 3 times if it is failed. Wait 10ms before every verification trial. Maximum 30ms delay will be applied to wait AMP idle state.
Changes : Created max98373_reset function to minimize code duplication. Changed regmap_write to regmap_update_bits. Other bits except LSB
need to be masked.
Added reset verification step to make sure software reset is completedwell. Software reset is done in 10ms in normal case.
Revision ID is available when the amp is in the idle state which meanssoftware reset is completed.
Software reset will be performed maximum 3 times to avoid amp resetfailure. Generally it is done in the first trial.
sleep time after software reset is increased + 30ms for every retrial.Maximum possible msleep time is 100 ms (initial 10 ms + 30 ms * 3 times).
This looks like it's supposed to be a changelog but it isn't one?
On Wed, Nov 28, 2018 at 05:55:48PM -0800, Grant Grundler wrote:
On Wed, Nov 28, 2018 at 9:07 AM Ryan Lee RyanS.Lee@maximintegrated.com wrote:
Not seeing a changelog here like I asked for :(
Actually I added changelog as below. Do you mean this is not sufficient?
The text is probably sufficient but not in a format that Mark can directly apply. Please take a quick look at Documentation/process/submitting-patches.rst.
Mark wants the "commit message" to be before the '---' line. So move the "Changes:" text up to become the commit message and drop the "Changes" line. That should explain why this commit is needed and include the S-o-B line.
Right. If you compare what's in git and what you're sending with other commits and mails and make sure everything looks similar you're probably on the right track.
-----Original Message----- From: Mark Brown broonie@kernel.org Sent: Thursday, November 29, 2018 3:26 AM To: Grant Grundler grundler@chromium.org Cc: Ryan Lee RyanS.Lee@maximintegrated.com; Liam Girdwood lgirdwood@gmail.com; perex@perex.cz; tiwai@suse.com; Kuninori Morimoto kuninori.morimoto.gx@renesas.com; Benson Leung bleung@chromium.org; alsa-devel@alsa-project.org; LKML <linux- kernel@vger.kernel.org>; ryan.lee.maxim@gmail.com Subject: Re: [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
On Wed, Nov 28, 2018 at 05:55:48PM -0800, Grant Grundler wrote:
On Wed, Nov 28, 2018 at 9:07 AM Ryan Lee
RyanS.Lee@maximintegrated.com wrote:
Not seeing a changelog here like I asked for :(
Actually I added changelog as below. Do you mean this is not sufficient?
The text is probably sufficient but not in a format that Mark can directly apply. Please take a quick look at Documentation/process/submitting-patches.rst.
Mark wants the "commit message" to be before the '---' line. So move the "Changes:" text up to become the commit message and drop the "Changes" line. That should explain why this commit is needed and include the S-o-B line.
Right. If you compare what's in git and what you're sending with other commits and mails and make sure everything looks similar you're probably on the right track.
I'm sorry for the mistake. Let me fix it.
-----Original Message----- From: Grant Grundler grundler@chromium.org Sent: Wednesday, November 28, 2018 5:56 PM To: Ryan Lee RyanS.Lee@maximintegrated.com Cc: broonie@kernel.org; Liam Girdwood lgirdwood@gmail.com; perex@perex.cz; tiwai@suse.com; Grant Grundler grundler@chromium.org; Kuninori Morimoto kuninori.morimoto.gx@renesas.com; Benson Leung bleung@chromium.org; alsa-devel@alsa-project.org; LKML <linux- kernel@vger.kernel.org>; ryan.lee.maxim@gmail.com Subject: Re: [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
EXTERNAL EMAIL
On Wed, Nov 28, 2018 at 9:07 AM Ryan Lee RyanS.Lee@maximintegrated.com wrote:
-----Original Message----- From: Mark Brown broonie@kernel.org Sent: Wednesday, November 28, 2018 1:50 AM To: Ryan Lee RyanS.Lee@maximintegrated.com Cc: Liam Girdwood lgirdwood@gmail.com; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Grant Grundler grundler@chromium.org; Kuninori Morimoto kuninori.morimoto.gx@renesas.com; Benson Leung bleung@chromium.org; alsa-devel@alsa-project.org; linux- kernel@vger.kernel.org; ryan.lee.maxim@gmail.com Subject: Re: [PATCH V2] ASoC: max98373: Added max98373_reset for stable amp reset
On Wed, Nov 28, 2018 at 03:20:16AM +0000, Ryan Lee wrote:
Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com
Not seeing a changelog here like I asked for :(
Actually I added changelog as below. Do you mean this is not sufficient?
The text is probably sufficient but not in a format that Mark can directly apply. Please take a quick look at Documentation/process/submitting-patches.rst.
Mark wants the "commit message" to be before the '---' line. So move the "Changes:" text up to become the commit message and drop the "Changes" line. That should explain why this commit is needed and include the S-o-B line.
Thanks for your help. I will fix it.
cheers, grant
Changes since v1 : Removed unusual repeat for amp software reset and
verification.
Amp software reset will be performed once and it repeatsverification maximum 3 times if it is failed.
Wait 10ms before every verification trial. Maximum 30ms delay willbe applied to wait AMP idle state.
Changes : Created max98373_reset function to minimize code duplication. Changed regmap_write to regmap_update_bits. Other bits except LSB
need to be masked.
Added reset verification step to make sure software resetis completed
well. Software reset is done in 10ms in normal case.
Revision ID is available when the amp is in the idlestate which means
software reset is completed.
Software reset will be performed maximum 3 times to avoidamp reset
failure. Generally it is done in the first trial.
sleep time after software reset is increased + 30ms for every retrial.Maximum possible msleep time is 100 ms (initial 10 ms + 30 ms * 3 times).
This looks like it's supposed to be a changelog but it isn't one?
participants (3)
-
Grant Grundler -
Mark Brown -
Ryan Lee