Unverified Commit b44a67f8 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: add snd_soc_daifmt_clock_provider_fliped() 



Sometimes we want to get CLOCK_PROVIDER fliped dai_fmt.
This patch adds new snd_soc_daifmt_clock_provider_fliped() for it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878s3dw9ex.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,8 @@ void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card, 
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

				   const char *propname);

int snd_soc_of_parse_aux_devs(struct snd_soc_card *card, const char *propname);



unsigned int snd_soc_daifmt_clock_provider_fliped(unsigned int dai_fmt);

unsigned int snd_soc_daifmt_clock_provider_from_bitmap(unsigned int bit_frame);

unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix,

sound/soc/soc-core.c

+25 −15
Original line number Diff line number Diff line
@@ -1249,21 +1249,8 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link

	 * the component which has non_legacy_dai_naming is Codec

	 */

	inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_MASTER_MASK;

	switch (dai_fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBS_CFM;

		break;

	case SND_SOC_DAIFMT_CBS_CFM:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFS;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

		break;

	}

	inv_dai_fmt = snd_soc_daifmt_clock_provider_fliped(dai_fmt);



	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {

		unsigned int fmt = dai_fmt;
@@ -3017,6 +3004,29 @@ int snd_soc_of_parse_aux_devs(struct snd_soc_card *card, const char *propname) 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_aux_devs);



unsigned int snd_soc_daifmt_clock_provider_fliped(unsigned int dai_fmt)

{

	unsigned int inv_dai_fmt = dai_fmt & ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK;



	switch (dai_fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;

		break;

	case SND_SOC_DAIFMT_CBP_CFC:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBC_CFP;

		break;

	case SND_SOC_DAIFMT_CBC_CFP:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBP_CFC;

		break;

	case SND_SOC_DAIFMT_CBC_CFC:

		inv_dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;

		break;

	}



	return inv_dai_fmt;

}

EXPORT_SYMBOL_GPL(snd_soc_daifmt_clock_provider_fliped);



unsigned int snd_soc_daifmt_clock_provider_from_bitmap(unsigned int bit_frame)

{

	/* Codec base */