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

ASoC: img: 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-11-ckeepax@opensource.cirrus.com


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

sound/soc/img/img-i2s-in.c

+3 −3
Original line number Diff line number Diff line
@@ -333,8 +333,8 @@ static int img_i2s_in_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:

		break;

	default:

		return -EINVAL;
@@ -373,7 +373,7 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
static const struct snd_soc_dai_ops img_i2s_in_dai_ops = {

	.trigger = img_i2s_in_trigger,

	.hw_params = img_i2s_in_hw_params,

	.set_fmt = img_i2s_in_set_fmt

	.set_fmt_new = img_i2s_in_set_fmt

};



static int img_i2s_in_dai_probe(struct snd_soc_dai *dai)

sound/soc/img/img-i2s-out.c

+4 −4
Original line number Diff line number Diff line
@@ -302,10 +302,10 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	if (force_clk_active)

		control_set |= IMG_I2S_OUT_CTL_CLK_EN_MASK;



	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:

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_BP_FP:

		control_set |= IMG_I2S_OUT_CTL_MASTER_MASK;

		break;

	default:
@@ -381,7 +381,7 @@ static int img_i2s_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
static const struct snd_soc_dai_ops img_i2s_out_dai_ops = {

	.trigger = img_i2s_out_trigger,

	.hw_params = img_i2s_out_hw_params,

	.set_fmt = img_i2s_out_set_fmt

	.set_fmt_new = img_i2s_out_set_fmt

};



static int img_i2s_out_dai_probe(struct snd_soc_dai *dai)