ASoC: arizona: Factor out rate selection code (b272efc8) · Commits · 戴 / test

sound/soc/codecs/arizona.c

+53 −36

Original line number	Diff line number	Diff line
		@@ -702,7 +702,7 @@ static int arizona_startup(struct snd_pcm_substream *substream,
		constraint);
		}

		static int arizona_hw_params(struct snd_pcm_substream *substream,
		static int arizona_hw_params_rate(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params,
		struct snd_soc_dai *dai)
		{
		@@ -710,28 +710,12 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
		struct arizona_dai_priv *dai_priv = &priv->dai[dai->id - 1];
		int base = dai->driver->base;
		const int *rates;
		int i;
		int bclk, lrclk, wl, frame, sr_val;

		if (params_rate(params) % 8000)
		rates = &arizona_44k1_bclk_rates[0];
		else
		rates = &arizona_48k_bclk_rates[0];

		for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) {
		if (rates[i] >= snd_soc_params_to_bclk(params) &&
		rates[i] % params_rate(params) == 0) {
		bclk = i;
		break;
		}
		}
		if (i == ARRAY_SIZE(arizona_44k1_bclk_rates)) {
		arizona_aif_err(dai, "Unsupported sample rate %dHz\n",
		params_rate(params));
		return -EINVAL;
		}
		int i, sr_val;

		/*
		* We will need to be more flexible than this in future,
		* currently we use a single sample rate for SYSCLK.
		*/
		for (i = 0; i < ARRAY_SIZE(arizona_sr_vals); i++)
		if (arizona_sr_vals[i] == params_rate(params))
		break;
		@@ -742,28 +726,18 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		}
		sr_val = i;

		lrclk = snd_soc_params_to_bclk(params) / params_rate(params);

		arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
		rates[bclk], rates[bclk] / lrclk);

		wl = snd_pcm_format_width(params_format(params));
		frame = wl << ARIZONA_AIF1TX_WL_SHIFT \| wl;

		/*
		* We will need to be more flexible than this in future,
		* currently we use a single sample rate for SYSCLK.
		*/
		switch (dai_priv->clk) {
		case ARIZONA_CLK_SYSCLK:
		snd_soc_update_bits(codec, ARIZONA_SAMPLE_RATE_1,
		ARIZONA_SAMPLE_RATE_1_MASK, sr_val);
		if (base)
		snd_soc_update_bits(codec, base + ARIZONA_AIF_RATE_CTRL,
		ARIZONA_AIF1_RATE_MASK, 0);
		break;
		case ARIZONA_CLK_ASYNCCLK:
		snd_soc_update_bits(codec, ARIZONA_ASYNC_SAMPLE_RATE_1,
		ARIZONA_ASYNC_SAMPLE_RATE_MASK, sr_val);
		if (base)
		snd_soc_update_bits(codec, base + ARIZONA_AIF_RATE_CTRL,
		ARIZONA_AIF1_RATE_MASK,
		8 << ARIZONA_AIF1_RATE_SHIFT);
		@@ -773,6 +747,49 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		return -EINVAL;
		}

		return 0;
		}

		static int arizona_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params,
		struct snd_soc_dai *dai)
		{
		struct snd_soc_codec *codec = dai->codec;
		int base = dai->driver->base;
		const int *rates;
		int i, ret;
		int bclk, lrclk, wl, frame;

		if (params_rate(params) % 8000)
		rates = &arizona_44k1_bclk_rates[0];
		else
		rates = &arizona_48k_bclk_rates[0];

		for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) {
		if (rates[i] >= snd_soc_params_to_bclk(params) &&
		rates[i] % params_rate(params) == 0) {
		bclk = i;
		break;
		}
		}
		if (i == ARRAY_SIZE(arizona_44k1_bclk_rates)) {
		arizona_aif_err(dai, "Unsupported sample rate %dHz\n",
		params_rate(params));
		return -EINVAL;
		}

		lrclk = snd_soc_params_to_bclk(params) / params_rate(params);

		arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
		rates[bclk], rates[bclk] / lrclk);

		wl = snd_pcm_format_width(params_format(params));
		frame = wl << ARIZONA_AIF1TX_WL_SHIFT \| wl;

		ret = arizona_hw_params_rate(substream, params, dai);
		if (ret != 0)
		return ret;

		snd_soc_update_bits(codec, base + ARIZONA_AIF_BCLK_CTRL,
		ARIZONA_AIF1_BCLK_FREQ_MASK, bclk);
		snd_soc_update_bits(codec, base + ARIZONA_AIF_TX_BCLK_RATE,

Admin message