]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: sun8i-codec: Partial revert to fix clock specifiers
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Mon, 13 Jun 2022 16:15:51 +0000 (17:15 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 14 Jun 2022 08:14:00 +0000 (09:14 +0100)
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>
sound/soc/sunxi/sun8i-codec.c

index 90d74a2d53f381ddf018e9d0b7c3041b4ae5886f..f797c535f29830363e88daeea7047f4817fef570 100644 (file)
@@ -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: