Unverified Commit 703ac1f2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: 88pm860x: Update to modern clocking terminology 



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

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


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

sound/soc/codecs/88pm860x-codec.c

+9 −9
Original line number Diff line number Diff line
@@ -968,16 +968,16 @@ static int pm860x_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai, 


	mask |= PCM_INF2_BCLK | PCM_INF2_FS | PCM_INF2_MASTER;



	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_CBM_CFS:

	/* set audio interface clocking */

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

	case SND_SOC_DAIFMT_CBP_CFC:

		if (pm860x->dir == PM860X_CLK_DIR_OUT) {

			inf |= PCM_INF2_MASTER;

			ret = 0;

		}

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		if (pm860x->dir == PM860X_CLK_DIR_IN) {

			inf &= ~PCM_INF2_MASTER;

			ret = 0;
@@ -1072,15 +1072,15 @@ static int pm860x_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai, 


	mask |= PCM_INF2_BCLK | PCM_INF2_FS | PCM_INF2_MASTER;



	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	/* set audio interface clocking */

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

		if (pm860x->dir == PM860X_CLK_DIR_OUT)

			inf |= PCM_INF2_MASTER;

		else

			return -EINVAL;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		if (pm860x->dir == PM860X_CLK_DIR_IN)

			inf &= ~PCM_INF2_MASTER;

		else