Unverified Commit 96781fd9 authored by Samuel Holland's avatar Samuel Holland Committed by Mark Brown
Browse files

ASoC: sun8i-codec: Fix setting DAI data format 



Use the correct mask for this two-bit field. This fixes setting the DAI
data format to RIGHT_J or DSP_A.

Fixes: 36c68493 ("ASoC: Add sun8i digital audio codec")
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20200217064250.15516-7-samuel@sholland.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3bc7b6c1

sound/soc/sunxi/sun8i-codec.c

+2 −1
Original line number Diff line number Diff line
@@ -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)
@@ -241,7 +242,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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE