summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2020-06-28 17:52:27 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-31 16:44:02 +0200
commitf91620544707e105f74bb71dc72a8ab27b55fddf (patch)
treee152e37bfef0e484c579db213bfd021aceb33362 /sound
parent4881d9b6cc9acf2da39d48f4dff7157ed75f6cd0 (diff)
downloadlinux-stable-f91620544707e105f74bb71dc72a8ab27b55fddf.tar.gz
linux-stable-f91620544707e105f74bb71dc72a8ab27b55fddf.tar.bz2
linux-stable-f91620544707e105f74bb71dc72a8ab27b55fddf.zip
ASoC: rt5670: Correct RT5670_LDO_SEL_MASK
commit 5cacc6f5764e94fa753b2c1f5f7f1f3f74286e82 upstream. The RT5670_PWR_ANLG1 register has 3 bits to select the LDO voltage, so the correct mask is 0x7 not 0x3. Because of this wrong mask we were programming the ldo bits to a setting of binary 001 (0x05 & 0x03) instead of binary 101 when moving to SND_SOC_BIAS_PREPARE. According to the datasheet 001 is a reserved value, so no idea what it did, since the driver was working fine before I guess we got lucky and it does something which is ok. Fixes: 5e8351de740d ("ASoC: add RT5670 CODEC driver") Signed-off-by: Hans de Goede <hdegoede@redhat.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20200628155231.71089-3-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rt5670.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h
index 3f1b0f1df809..e4e31e82311d 100644
--- a/sound/soc/codecs/rt5670.h
+++ b/sound/soc/codecs/rt5670.h
@@ -760,7 +760,7 @@
#define RT5670_PWR_VREF2_BIT 4
#define RT5670_PWR_FV2 (0x1 << 3)
#define RT5670_PWR_FV2_BIT 3
-#define RT5670_LDO_SEL_MASK (0x3)
+#define RT5670_LDO_SEL_MASK (0x7)
#define RT5670_LDO_SEL_SFT 0
/* Power Management for Analog 2 (0x64) */