summaryrefslogtreecommitdiffstats
path: root/sound/soc/sunxi
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.cirrus.com>2022-06-13 17:15:51 +0100
committerMark Brown <broonie@kernel.org>2022-06-14 09:14:00 +0100
commitbeb89d1d49e9ae1188356d6e37581e5f0b5f62b4 (patch)
treedbfee0803d4fb6b1dfa38aabe4cc7b2a474bd8ff /sound/soc/sunxi
parent18489174e4fb98ad07fd387973a39e755ac01dee (diff)
downloadlinux-stable-beb89d1d49e9ae1188356d6e37581e5f0b5f62b4.tar.gz
linux-stable-beb89d1d49e9ae1188356d6e37581e5f0b5f62b4.tar.bz2
linux-stable-beb89d1d49e9ae1188356d6e37581e5f0b5f62b4.zip
ASoC: sun8i-codec: Partial revert to fix clock specifiers
Recent updates accidentally updated the clock producer/consumer specifiers on this device as part of refactoring the CPU side of the DAI links. However, this device sits on the CODEC side and shouldn't have been updated. Partially revert the changes keeping the switch to the new clock terminology but going back to the CODEC defines. Fixes: 7cc3965fde74 ("ASoC: sunxi: Update to use set_fmt_new callback") Reported-by: Samuel Holland <samuel@sholland.org> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Reviewed-by: Samuel Holland <samuel@sholland.org> Tested-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20220613161552.481337-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sunxi')
-rw-r--r--sound/soc/sunxi/sun8i-codec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 90d74a2d53f3..f797c535f298 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -287,10 +287,10 @@ static int sun8i_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
/* clock masters */
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
- case SND_SOC_DAIFMT_BP_FP: /* Codec slave, DAI master */
+ case SND_SOC_DAIFMT_CBC_CFC: /* Codec slave, DAI master */
value = 0x1;
break;
- case SND_SOC_DAIFMT_BC_FC: /* Codec Master, DAI slave */
+ case SND_SOC_DAIFMT_CBP_CFP: /* Codec Master, DAI slave */
value = 0x0;
break;
default: