Unverified Commit d0900042 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: dwc-i2s: Update to modern clocking terminology 



As part of moving to remove the old style defines for the bus clocks update
the dwc-i2s driver to use more modern terminology for clocking.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210921205313.46710-1-broonie@kernel.org


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

sound/soc/dwc/dwc-i2s.c

+6 −6
Original line number Diff line number Diff line
@@ -356,25 +356,25 @@ static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);

	int ret = 0;



	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_CBP_CFP:

		if (dev->capability & DW_I2S_SLAVE)

			ret = 0;

		else

			ret = -EINVAL;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		if (dev->capability & DW_I2S_MASTER)

			ret = 0;

		else

			ret = -EINVAL;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_CBP_CFC:

	case SND_SOC_DAIFMT_CBC_CFP:

		ret = -EINVAL;

		break;

	default:

		dev_dbg(dev->dev, "dwc : Invalid master/slave format\n");

		dev_dbg(dev->dev, "dwc : Invalid clock provider format\n");

		ret = -EINVAL;

		break;

	}