Commit 462e244f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.15-rc7' of... 

Merge tag 'asoc-fix-v6.15-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.15

A couple more small fixes for v6.15, both of which could also easily
wait until the merge window.
parents f709b78a 688abe28

sound/soc/apple/mca.c

+23 −0
Original line number Diff line number Diff line
@@ -464,6 +464,28 @@ static int mca_configure_serdes(struct mca_cluster *cl, int serdes_unit, 
	return -EINVAL;

}



static int mca_fe_startup(struct snd_pcm_substream *substream,

			  struct snd_soc_dai *dai)

{

	struct mca_cluster *cl = mca_dai_to_cluster(dai);

	unsigned int mask, nchannels;



	if (cl->tdm_slots) {

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			mask = cl->tdm_tx_mask;

		else

			mask = cl->tdm_rx_mask;



		nchannels = hweight32(mask);

	} else {

		nchannels = 2;

	}



	return snd_pcm_hw_constraint_minmax(substream->runtime,

					    SNDRV_PCM_HW_PARAM_CHANNELS,

					    1, nchannels);

}



static int mca_fe_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,

			       unsigned int rx_mask, int slots, int slot_width)

{
@@ -680,6 +702,7 @@ static int mca_fe_hw_params(struct snd_pcm_substream *substream, 
}



static const struct snd_soc_dai_ops mca_fe_ops = {

	.startup = mca_fe_startup,

	.set_fmt = mca_fe_set_fmt,

	.set_bclk_ratio = mca_set_bclk_ratio,

	.set_tdm_slot = mca_fe_set_tdm_slot,

sound/soc/qcom/sdm845.c

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream, 
		else

			ret = snd_soc_dai_set_channel_map(cpu_dai, tx_ch_cnt,

							  tx_ch, 0, NULL);

		if (ret != 0 && ret != -ENOTSUPP) {

			dev_err(rtd->dev, "failed to set cpu chan map, err:%d\n", ret);

			return ret;

		}

	}



	return 0;