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

ASoC: use inclusive language for 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

We have both

	(A) SND_SOC_DAIFMT_CB{M/S}_CF{M/S} : Master/Slave.
	(B) SND_SOC_DAIFMT_CB{P/C}_CF{P/S} : Provider/Consumer

We should use (B), and want to remove (A). This patch-set do it.
parents 56e8bbb7 0f68f56a

Documentation/sound/soc/codec-to-codec.rst

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ file: 
    .codec_dai_name = "codec-2-dai_name",

    .platform_name = "samsung-i2s.0",

    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

            | SND_SOC_DAIFMT_CBM_CFM,

            | SND_SOC_DAIFMT_CBP_CFP,

    .ignore_suspend = 1,

    .c2c_params = &dsp_codec_params,

    .num_c2c_params = 1,
@@ -80,7 +80,7 @@ file: 
    .codec_name = "codec-3,

    .codec_dai_name = "codec-3-dai_name",

    .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

            | SND_SOC_DAIFMT_CBM_CFM,

            | SND_SOC_DAIFMT_CBP_CFP,

    .ignore_suspend = 1,

    .c2c_params = &dsp_codec_params,

    .num_c2c_params = 1,

include/sound/soc-dai.h

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ struct snd_compr_stream; 
#define SND_SOC_DAIFMT_CBP_CFC		(3 << 12) /* codec clk provider & frame consumer */

#define SND_SOC_DAIFMT_CBC_CFC		(4 << 12) /* codec clk consumer & frame consumer */



/* previous definitions kept for backwards-compatibility, do not use in new contributions */

#define SND_SOC_DAIFMT_CBM_CFM		SND_SOC_DAIFMT_CBP_CFP

#define SND_SOC_DAIFMT_CBS_CFM		SND_SOC_DAIFMT_CBC_CFP

#define SND_SOC_DAIFMT_CBM_CFS		SND_SOC_DAIFMT_CBP_CFC

#define SND_SOC_DAIFMT_CBS_CFS		SND_SOC_DAIFMT_CBC_CFC



/* when passed to set_fmt directly indicate if the device is provider or consumer */

#define SND_SOC_DAIFMT_BP_FP		SND_SOC_DAIFMT_CBP_CFP

#define SND_SOC_DAIFMT_BC_FP		SND_SOC_DAIFMT_CBC_CFP

sound/soc/amd/acp/acp-mach-common.c

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static int acp_max98388_hw_params(struct snd_pcm_substream *substream, 
	int ret;



	ret = snd_soc_dai_set_fmt(codec_dai,

				  SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_CBC_CFC | SND_SOC_DAIFMT_I2S |

				  SND_SOC_DAIFMT_NB_NF);

	if (ret < 0)

		return ret;

sound/soc/codecs/arizona.c

+6 −6
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		break;

	case SND_SOC_DAIFMT_DSP_B:

		if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)

				!= SND_SOC_DAIFMT_CBM_CFM) {

				!= SND_SOC_DAIFMT_CBP_CFP) {

			arizona_aif_err(dai, "DSP_B not valid in slave mode\n");

			return -EINVAL;

		}
@@ -1468,7 +1468,7 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
		break;

	case SND_SOC_DAIFMT_LEFT_J:

		if ((fmt & SND_SOC_DAIFMT_MASTER_MASK)

				!= SND_SOC_DAIFMT_CBM_CFM) {

				!= SND_SOC_DAIFMT_CBP_CFP) {

			arizona_aif_err(dai, "LEFT_J not valid in slave mode\n");

			return -EINVAL;

		}
@@ -1481,15 +1481,15 @@ static int arizona_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	}



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		break;

	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_CBC_CFP:

		lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

	case SND_SOC_DAIFMT_CBP_CFC:

		bclk |= ARIZONA_AIF1_BCLK_MSTR;

		break;

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_CBP_CFP:

		bclk |= ARIZONA_AIF1_BCLK_MSTR;

		lrclk |= ARIZONA_AIF1TX_LRCLK_MSTR;

		break;

sound/soc/codecs/cs35l32.c

+2 −2
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ static int cs35l32_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 
	struct snd_soc_component *component = codec_dai->component;



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_CBP_CFP:

		snd_soc_component_update_bits(component, CS35L32_ADSP_CTL,

				    CS35L32_ADSP_MASTER_MASK,

				CS35L32_ADSP_MASTER_MASK);

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		snd_soc_component_update_bits(component, CS35L32_ADSP_CTL,

				    CS35L32_ADSP_MASTER_MASK, 0);

		break;