diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-08-02 09:04:48 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-08-02 09:04:48 +0200 |
commit | 01099b1ad9101ca3f41071a87b9c496d9ea1d2ad (patch) | |
tree | 0fe7a9b87fd8dea482089c49ce65c4b5b4a9a135 /sound/soc/codecs/tlv320aic31xx.h | |
parent | 825a52482a616d74bd2f5eacc0f8946d025499a7 (diff) | |
parent | eda80d7c9c4db0f55f130e38c682e19b58d5add7 (diff) | |
download | linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.tar.gz linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.tar.bz2 linux-01099b1ad9101ca3f41071a87b9c496d9ea1d2ad.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic31xx.h')
-rw-r--r-- | sound/soc/codecs/tlv320aic31xx.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) |