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

ASoC: dwc: 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 this CPU side driver to use the new direct
callback.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-8-ckeepax@opensource.cirrus.com


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

sound/soc/dwc/dwc-i2s.c

+5 −5
Original line number Diff line number Diff line
@@ -357,20 +357,20 @@ static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
	int ret = 0;



	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

	case SND_SOC_DAIFMT_BC_FC:

		if (dev->capability & DW_I2S_SLAVE)

			ret = 0;

		else

			ret = -EINVAL;

		break;

	case SND_SOC_DAIFMT_CBC_CFC:

	case SND_SOC_DAIFMT_BP_FP:

		if (dev->capability & DW_I2S_MASTER)

			ret = 0;

		else

			ret = -EINVAL;

		break;

	case SND_SOC_DAIFMT_CBP_CFC:

	case SND_SOC_DAIFMT_CBC_CFP:

	case SND_SOC_DAIFMT_BC_FP:

	case SND_SOC_DAIFMT_BP_FC:

		ret = -EINVAL;

		break;

	default:
@@ -387,7 +387,7 @@ static const struct snd_soc_dai_ops dw_i2s_dai_ops = { 
	.hw_params	= dw_i2s_hw_params,

	.prepare	= dw_i2s_prepare,

	.trigger	= dw_i2s_trigger,

	.set_fmt	= dw_i2s_set_fmt,

	.set_fmt_new	= dw_i2s_set_fmt,

};



#ifdef CONFIG_PM