Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / sunxi / sun8i-codec.c

diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 0bea2162f68d98464ab650118270b6fb6bfa7de9..9844978d91e6e0182318ecd176ca4b0effa7e3d7 100644 (file)
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -286,11 +286,11 @@ static int sun8i_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        u32 dsp_format, format, invert, value;
 
        /* clock masters */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS: /* Codec slave, DAI master */
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC: /* Codec slave, DAI master */
                value = 0x1;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM: /* Codec Master, DAI slave */
+       case SND_SOC_DAIFMT_CBP_CFP: /* Codec Master, DAI slave */
                value = 0x0;
                break;
        default:
@@ -1278,7 +1278,6 @@ static const struct snd_soc_component_driver sun8i_soc_component = {
        .probe                  = sun8i_codec_component_probe,
        .idle_bias_on           = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config sun8i_codec_regmap_config = {