]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: rt5677: Mark reg RT5677_PWR_ANLG2 as volatile
authorBen Zhang <benzh@chromium.org>
Wed, 6 Nov 2019 01:13:30 +0000 (17:13 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 31 Dec 2019 15:45:18 +0000 (16:45 +0100)
[ Upstream commit eabf424f7b60246c76dcb0ea6f1e83ef9abbeaa6 ]

The codec dies when RT5677_PWR_ANLG2(MX-64h) is set to 0xACE1
while it's streaming audio over SPI. The DSP firmware turns
on PLL2 (MX-64 bit 8) when SPI streaming starts.  However regmap
does not believe that register can change by itself. When
BST1 (bit 15) is turned on with regmap_update_bits(), it doesn't
read the register first before write, so PLL2 power bit is
cleared by accident.

Marking MX-64h as volatile in regmap solved the issue.

Signed-off-by: Ben Zhang <benzh@chromium.org>
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Link: https://lore.kernel.org/r/20191106011335.223061-6-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/rt5677.c

index 315a3d39bc09103653ac03f4ebcc9c1775473a51..8bc9450da79cf68818f69850c135f196f9061014 100644 (file)
@@ -298,6 +298,7 @@ static bool rt5677_volatile_register(struct device *dev, unsigned int reg)
        case RT5677_I2C_MASTER_CTRL7:
        case RT5677_I2C_MASTER_CTRL8:
        case RT5677_HAP_GENE_CTRL2:
+       case RT5677_PWR_ANLG2: /* Modified by DSP firmware */
        case RT5677_PWR_DSP_ST:
        case RT5677_PRIV_DATA:
        case RT5677_ASRC_22: