Commit 76bf969e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: arizona: Ensure we clock two channels for I2S mode



I2S requires stereo clocking even for mono data.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 3f341f74
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
	struct arizona *arizona = priv->arizona;
	int base = dai->driver->base;
	const int *rates;
	int i, ret;
	int i, ret, val;
	int chan_limit = arizona->pdata.max_channels_clocked[dai->id - 1];
	int bclk, lrclk, wl, frame, bclk_target;

@@ -834,6 +834,13 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		bclk_target *= chan_limit;
	}

	/* Force stereo for I2S mode */
	val = snd_soc_read(codec, base + ARIZONA_AIF_FORMAT);
	if (params_channels(params) == 1 && (val & ARIZONA_AIF1_FMT_MASK)) {
		arizona_aif_dbg(dai, "Forcing stereo mode\n");
		bclk_target *= 2;
	}

	for (i = 0; i < ARRAY_SIZE(arizona_44k1_bclk_rates); i++) {
		if (rates[i] >= bclk_target &&
		    rates[i] % params_rate(params) == 0) {