ASoC: Intel: bytcr_rt5640: Remove code duplication in byt_rt5640_codec_fixup (332719b1) · Commits · 戴 / test

sound/soc/intel/boards/bytcr_rt5640.c

+23 −45

Original line number	Diff line number	Diff line
		@@ -940,7 +940,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
		SNDRV_PCM_HW_PARAM_RATE);
		struct snd_interval *channels = hw_param_interval(params,
		SNDRV_PCM_HW_PARAM_CHANNELS);
		int ret;
		int ret, bits;

		/* The DSP will covert the FE rate to 48k, stereo */
		rate->min = rate->max = 48000;
		@@ -948,57 +948,35 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,

		if ((byt_rt5640_quirk & BYT_RT5640_SSP0_AIF1) \|\|
		(byt_rt5640_quirk & BYT_RT5640_SSP0_AIF2)) {

		/* set SSP0 to 16-bit */
		params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);

		/*
		* Default mode for SSP configuration is TDM 4 slot, override config
		* with explicit setting to I2S 2ch 16-bit. The word length is set with
		* dai_set_tdm_slot() since there is no other API exposed
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBS_CFS
		);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
		return ret;
		}

		ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 16);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set I2S config, err %d\n", ret);
		return ret;
		}

		bits = 16;
		} else {

		/* set SSP2 to 24-bit */
		params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
		bits = 24;
		}

		/*
		* Default mode for SSP configuration is TDM 4 slot, override config
		* with explicit setting to I2S 2ch 24-bit. The word length is set with
		* with explicit setting to I2S 2ch. The word length is set with
		* dai_set_tdm_slot() since there is no other API exposed
		*/
		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,
		SND_SOC_DAIFMT_I2S \|
		SND_SOC_DAIFMT_NB_NF \|
		SND_SOC_DAIFMT_CBS_CFS
		);
		SND_SOC_DAIFMT_CBS_CFS);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
		return ret;
		}

		ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, 24);
		ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2, bits);
		if (ret < 0) {
		dev_err(rtd->dev, "can't set I2S config, err %d\n", ret);
		return ret;
		}
		}

		return 0;
		}

Admin message