Unverified Commit add9ee8c authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: Intel: 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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-12-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ed2b3840

sound/soc/intel/atom/sst-atom-controls.c

+2 −2
Original line number Diff line number Diff line
@@ -831,9 +831,9 @@ static int sst_get_ssp_mode(struct snd_soc_dai *dai, unsigned int fmt) 
	dev_dbg(dai->dev, "Enter:%s, format=%x\n", __func__, format);



	switch (format) {

	case SND_SOC_DAIFMT_CBC_CFC:

	case SND_SOC_DAIFMT_BP_FP:

		return SSP_MODE_PROVIDER;

	case SND_SOC_DAIFMT_CBP_CFP:

	case SND_SOC_DAIFMT_BC_FC:

		return SSP_MODE_CONSUMER;

	default:

		dev_err(dai->dev, "Invalid ssp protocol: %d\n", format);

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ static const struct snd_soc_dai_ops sst_compr_dai_ops = { 
static const struct snd_soc_dai_ops sst_be_dai_ops = {

	.startup = sst_enable_ssp,

	.hw_params = sst_be_hw_params,

	.set_fmt = sst_set_format,

	.set_fmt_new = sst_set_format,

	.set_tdm_slot = sst_platform_set_ssp_slot,

	.shutdown = sst_disable_ssp,

};

sound/soc/intel/boards/bytcht_cx2072x.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd, 
	ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),

				SND_SOC_DAIFMT_I2S     |

				SND_SOC_DAIFMT_NB_NF   |

				SND_SOC_DAIFMT_CBC_CFC);

				SND_SOC_DAIFMT_BP_FP);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);

		return ret;

sound/soc/intel/boards/bytcht_da7213.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, 
	ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),

				  SND_SOC_DAIFMT_I2S     |

				  SND_SOC_DAIFMT_NB_NF   |

				  SND_SOC_DAIFMT_CBC_CFC);

				  SND_SOC_DAIFMT_BP_FP);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);

		return ret;

sound/soc/intel/boards/bytcht_es8316.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
	ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),

				SND_SOC_DAIFMT_I2S     |

				SND_SOC_DAIFMT_NB_NF   |

				SND_SOC_DAIFMT_CBC_CFC

				SND_SOC_DAIFMT_BP_FP

		);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);