[alsa-devel] [PATCH 1/2] ASoC: sgtl5000: fix wrong register MIC_BIAS_VOLTAGE setup on probe
Cc: Liam Girdwood lgirdwood@gmail.com Cc: Takashi Iwai tiwai@suse.com Cc: Fabio Estevam fabio.estevam@freescale.com Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Gianluca Renzi gianlucarenzi@eurekelettronica.it --- sound/soc/codecs/sgtl5000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/codecs/sgtl5000.c 2015-09-25 15:24:10.597051191 +0200 +++ b/sound/soc/codecs/sgtl5000.c 2015-09-25 21:26:07.102020194 +0200 @@ -1376,8 +1376,8 @@ static int sgtl5000_probe(struct snd_soc sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);
snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, - SGTL5000_BIAS_R_MASK, - sgtl5000->micbias_voltage << SGTL5000_BIAS_R_SHIFT); + SGTL5000_BIAS_VOLT_MASK, + sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT); /* * disable DAP * TODO:
Cc: Liam Girdwood lgirdwood@gmail.com Cc: Takashi Iwai tiwai@suse.com Cc: Fabio Estevam fabio.estevam@freescale.com Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Gianluca Renzi gianlucarenzi@eurekelettronica.it --- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertions(+), 1 deletions(-)
--- a/sound/soc/codecs/sgtl5000.c 2015-09-25 15:24:10.597051191 +0200 +++ b/sound/soc/codecs/sgtl5000.c 2015-09-25 21:28:00.318016274 +0200 @@ -1549,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c else { sgtl5000->micbias_voltage = 0; dev_err(&client->dev, - "Unsuitable MicBias resistor\n"); + "Unsuitable MicBias voltage\n"); } } else { sgtl5000->micbias_voltage = 0;
The patch
ASoC: sgtl5000: fix error message output for MicBias voltage
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 fb97d75b038659998257f7dd767d8229dce50b74 Mon Sep 17 00:00:00 2001
From: Gianluca Renzi gianlucarenzi@eurekelettronica.it Date: Fri, 25 Sep 2015 21:33:42 +0200 Subject: [PATCH] ASoC: sgtl5000: fix error message output for MicBias voltage
Cc: Liam Girdwood lgirdwood@gmail.com Cc: Takashi Iwai tiwai@suse.com Cc: Fabio Estevam fabio.estevam@freescale.com Cc: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Gianluca Renzi gianlucarenzi@eurekelettronica.it Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index bfda25e..6e7843e 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1549,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, else { sgtl5000->micbias_voltage = 0; dev_err(&client->dev, - "Unsuitable MicBias resistor\n"); + "Unsuitable MicBias voltage\n"); } } else { sgtl5000->micbias_voltage = 0;
participants (2)
-
Gianluca Renzi -
Mark Brown