diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-02-24 22:26:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-24 22:26:06 +0000 |
| commit | 6c8beff74c6aafa60cb69b44139de58b74a775e7 (patch) | |
| tree | beeb7ed4968bb1426a38fbc77e3d71ecd4306fbd /sound/soc/sunxi/sun8i-codec.c | |
| parent | ASoC: soc-pcm cleanup step4 (diff) | |
| parent | ASoC: Intel: Skylake: Fix available clock counter incrementation (diff) | |
| download | linux-dev-6c8beff74c6aafa60cb69b44139de58b74a775e7.tar.xz linux-dev-6c8beff74c6aafa60cb69b44139de58b74a775e7.zip | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/sunxi/sun8i-codec.c')
| -rw-r--r-- | sound/soc/sunxi/sun8i-codec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 41471bd01042..ca51af114419 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -80,6 +80,7 @@ #define SUN8I_SYS_SR_CTRL_AIF1_FS_MASK GENMASK(15, 12) #define SUN8I_SYS_SR_CTRL_AIF2_FS_MASK GENMASK(11, 8) +#define SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK GENMASK(3, 2) #define SUN8I_AIF1CLK_CTRL_AIF1_WORD_SIZ_MASK GENMASK(5, 4) #define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV_MASK GENMASK(8, 6) #define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV_MASK GENMASK(12, 9) @@ -240,7 +241,7 @@ static int sun8i_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } regmap_update_bits(scodec->regmap, SUN8I_AIF1CLK_CTRL, - BIT(SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT), + SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT_MASK, value << SUN8I_AIF1CLK_CTRL_AIF1_DATA_FMT); return 0; |