| Message ID | 20210622010941.241386-1-bkylerussell@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9cf76a72af6ab81030dea6481b1d7bdd814fbdaf |
| Headers | show |
| Series | ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits | expand |
On Mon, 21 Jun 2021 21:09:41 -0400, Kyle Russell wrote: > These are backwards from Table 7-71 of the TLV320AIC3100 spec [1]. > > This was broken in 12eb4d66ba2e 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) > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits commit: 9cf76a72af6ab81030dea6481b1d7bdd814fbdaf 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
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 81952984613d..2513922a0292 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -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)
These are backwards from Table 7-71 of the TLV320AIC3100 spec [1]. This was broken in 12eb4d66ba2e 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: Kyle Russell <bkylerussell@gmail.com> --- sound/soc/codecs/tlv320aic31xx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)