iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ep93xx: Convert to modern clocking terminology

Browse Source 
As part of the effort to remove our old APIs based on outdated terminology
update the EP93xx drivers to use modern terminology.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210916143828.36215-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mark Brown 2021-09-16 15:38:28 +01:00
parent 501849d97e
commit c7801a3c68
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/cirrus/edb93xx.c
View File

@ -60,7 +60,7 @@ static struct snd_soc_dai_link edb93xx_dai = {
.name = "CS4271", .name = "CS4271",
.stream_name = "CS4271 HiFi", .stream_name = "CS4271 HiFi",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ops = &edb93xx_ops, .ops = &edb93xx_ops,
SND_SOC_DAILINK_REG(hifi), SND_SOC_DAILINK_REG(hifi),
}; };

10
sound/soc/cirrus/ep93xx-i2s.c
View File

@ -245,14 +245,14 @@ static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
return -EINVAL; return -EINVAL;
} }
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBC_CFC:
/* CPU is master */ /* CPU is provider */
clk_cfg |= EP93XX_I2S_CLKCFG_MASTER; clk_cfg |= EP93XX_I2S_CLKCFG_MASTER;
break; break;
case SND_SOC_DAIFMT_CBM_CFM: case SND_SOC_DAIFMT_CBP_CFP:
/* Codec is master */ /* Codec is provider */
clk_cfg &= ~EP93XX_I2S_CLKCFG_MASTER; clk_cfg &= ~EP93XX_I2S_CLKCFG_MASTER;
break; break;

2
sound/soc/cirrus/snappercl15.c
View File

@ -70,7 +70,7 @@ static struct snd_soc_dai_link snappercl15_dai = {
.name = "tlv320aic23", .name = "tlv320aic23",
.stream_name = "AIC23", .stream_name = "AIC23",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ops = &snappercl15_ops, .ops = &snappercl15_ops,
SND_SOC_DAILINK_REG(aic23), SND_SOC_DAILINK_REG(aic23),
}; };