mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
ASoC: samsung: Update to use set_fmt_new callback
As part of updating the core to directly tell drivers if they are clock provider or consumer update these CPU side drivers to use the new direct callback. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220519154318.2153729-20-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
27646d265d
commit
0b491c7c1b
4 changed files with 15 additions and 15 deletions
|
@ -671,11 +671,11 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
|
||||
case SND_SOC_DAIFMT_BC_FC:
|
||||
tmp |= mod_slave;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
case SND_SOC_DAIFMT_BP_FP:
|
||||
/*
|
||||
* Set default source clock in Master mode, only when the
|
||||
* CLK_I2S_RCLK_SRC clock is not exposed so we ensure any
|
||||
|
@ -1107,7 +1107,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
|
|||
static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
|
||||
.trigger = i2s_trigger,
|
||||
.hw_params = i2s_hw_params,
|
||||
.set_fmt = i2s_set_fmt,
|
||||
.set_fmt_new = i2s_set_fmt,
|
||||
.set_clkdiv = i2s_set_clkdiv,
|
||||
.set_sysclk = i2s_set_sysclk,
|
||||
.startup = i2s_startup,
|
||||
|
|
|
@ -340,8 +340,8 @@ static int s3c_pcm_set_fmt(struct snd_soc_dai *cpu_dai,
|
|||
goto exit;
|
||||
}
|
||||
|
||||
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_BP_FP:
|
||||
/* Nothing to do, Master by default */
|
||||
break;
|
||||
default:
|
||||
|
@ -437,7 +437,7 @@ static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {
|
|||
.set_clkdiv = s3c_pcm_set_clkdiv,
|
||||
.trigger = s3c_pcm_trigger,
|
||||
.hw_params = s3c_pcm_hw_params,
|
||||
.set_fmt = s3c_pcm_set_fmt,
|
||||
.set_fmt_new = s3c_pcm_set_fmt,
|
||||
};
|
||||
|
||||
static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)
|
||||
|
|
|
@ -252,12 +252,12 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
|
|||
iismod = readl(i2s->regs + S3C2412_IISMOD);
|
||||
pr_debug("hw_params r: IISMOD: %x \n", iismod);
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
|
||||
case SND_SOC_DAIFMT_BC_FC:
|
||||
i2s->master = 0;
|
||||
iismod |= S3C2412_IISMOD_SLAVE;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
case SND_SOC_DAIFMT_BP_FP:
|
||||
i2s->master = 1;
|
||||
iismod &= ~S3C2412_IISMOD_SLAVE;
|
||||
break;
|
||||
|
@ -666,7 +666,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
|
|||
ops->trigger = s3c2412_i2s_trigger;
|
||||
if (!ops->hw_params)
|
||||
ops->hw_params = s3c_i2sv2_hw_params;
|
||||
ops->set_fmt = s3c2412_i2s_set_fmt;
|
||||
ops->set_fmt_new = s3c2412_i2s_set_fmt;
|
||||
ops->set_clkdiv = s3c2412_i2s_set_clkdiv;
|
||||
ops->set_sysclk = s3c_i2sv2_set_sysclk;
|
||||
|
||||
|
|
|
@ -169,11 +169,11 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
|
|||
iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
|
||||
pr_debug("hw_params r: IISMOD: %x \n", iismod);
|
||||
|
||||
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
|
||||
case SND_SOC_DAIFMT_CBM_CFM:
|
||||
switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
|
||||
case SND_SOC_DAIFMT_BC_CFC:
|
||||
iismod |= S3C2410_IISMOD_SLAVE;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_CBS_CFS:
|
||||
case SND_SOC_DAIFMT_BP_FP:
|
||||
iismod &= ~S3C2410_IISMOD_SLAVE;
|
||||
break;
|
||||
default:
|
||||
|
@ -394,7 +394,7 @@ static int s3c24xx_i2s_resume(struct snd_soc_component *component)
|
|||
static const struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {
|
||||
.trigger = s3c24xx_i2s_trigger,
|
||||
.hw_params = s3c24xx_i2s_hw_params,
|
||||
.set_fmt = s3c24xx_i2s_set_fmt,
|
||||
.set_fmt_new = s3c24xx_i2s_set_fmt,
|
||||
.set_clkdiv = s3c24xx_i2s_set_clkdiv,
|
||||
.set_sysclk = s3c24xx_i2s_set_sysclk,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue