Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a57c75ff authored by Kyle Russell's avatar Kyle Russell Committed by Greg Kroah-Hartman
Browse files

ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits 

[ Upstream commit 9cf76a72af6ab81030dea6481b1d7bdd814fbdaf ]

These are backwards from Table 7-71 of the TLV320AIC3100 spec [1].

This was broken in 12eb4d66 when BCLK_MASTER and WCLK_MASTER
were converted from 0x08 and 0x04 to BIT(2) and BIT(3), respectively.

-#define AIC31XX_BCLK_MASTER		0x08
-#define AIC31XX_WCLK_MASTER		0x04
+#define AIC31XX_BCLK_MASTER		BIT(2)
+#define AIC31XX_WCLK_MASTER		BIT(3)

Probably just a typo since the defines were not listed in bit order.

[1] https://www.ti.com/lit/gpn/tlv320aic3100



Signed-off-by: default avatarKyle Russell <bkylerussell@gmail.com>
Link: https://lore.kernel.org/r/20210622010941.241386-1-bkylerussell@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e2cccb83

sound/soc/codecs/tlv320aic31xx.h

+2 −2
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ struct aic31xx_pdata { 
#define AIC31XX_WORD_LEN_24BITS		0x02

#define AIC31XX_WORD_LEN_32BITS		0x03

#define AIC31XX_IFACE1_MASTER_MASK	GENMASK(3, 2)

#define AIC31XX_BCLK_MASTER		BIT(2)

#define AIC31XX_WCLK_MASTER		BIT(3)

#define AIC31XX_BCLK_MASTER		BIT(3)

#define AIC31XX_WCLK_MASTER		BIT(2)



/* AIC31XX_DATA_OFFSET */

#define AIC31XX_DATA_OFFSET_MASK	GENMASK(7, 0)