diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-08-01 09:11:19 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-08-01 09:11:19 +0300 |
| commit | 9769e44d41a1359b9000ff8458f0f2f66080ebf4 (patch) | |
| tree | e91d2d71fd469c2fa9289fed87f0bb4fded196a5 /sound/soc/codecs/rk3328_codec.c | |
| parent | f38e6458e16df7bac3871f4e69f9681c0b3c58bd (diff) | |
| parent | be561ffad708f0cee18aee4231f80ffafaf7a419 (diff) | |
| download | linux-9769e44d41a1359b9000ff8458f0f2f66080ebf4.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/rk3328_codec.c')
| -rw-r--r-- | sound/soc/codecs/rk3328_codec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c index 86b679cf7aef..1d523bfd9d84 100644 --- a/sound/soc/codecs/rk3328_codec.c +++ b/sound/soc/codecs/rk3328_codec.c @@ -69,11 +69,11 @@ static int rk3328_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) snd_soc_component_get_drvdata(dai->component); unsigned int val; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: val = PIN_DIRECTION_IN | DAC_I2S_MODE_SLAVE; break; - case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBP_CFP: val = PIN_DIRECTION_OUT | DAC_I2S_MODE_MASTER; break; default: |