Commit 9bf9bf54 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.4-2' of... 

Merge tag 'asoc-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Final merge window fixes for v5.4

A few small fixes and one feature that came in since I sent you the
earlier pull request.
parents d3f9990f a54f8485

sound/soc/codecs/wcd9335.c

+8 −16
Original line number Diff line number Diff line
@@ -3022,7 +3022,6 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = snd_soc_component_get_drvdata(comp);

	struct wcd_slim_codec_dai_data *dai = &wcd->dai[w->shift];

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:
@@ -3034,7 +3033,7 @@ static int wcd9335_codec_enable_slim(struct snd_soc_dapm_widget *w, 
		break;

	}



	return ret;

	return 0;

}



static int wcd9335_codec_enable_mix_path(struct snd_soc_dapm_widget *w,
@@ -3539,7 +3538,6 @@ static int wcd9335_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	u8 dem_inp;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3579,7 +3577,7 @@ static int wcd9335_codec_hphl_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_lineout_dac_event(struct snd_soc_dapm_widget *w,
@@ -3607,7 +3605,6 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3621,7 +3618,7 @@ static int wcd9335_codec_ear_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static void wcd9335_codec_hph_post_pa_config(struct wcd9335_codec *wcd,
@@ -3692,7 +3689,6 @@ static int wcd9335_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	u8 dem_inp;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3731,7 +3727,7 @@ static int wcd9335_codec_hphr_dac_event(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
@@ -3741,7 +3737,6 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3780,7 +3775,7 @@ static int wcd9335_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w,
@@ -3789,7 +3784,6 @@ static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	int vol_reg = 0, mix_vol_reg = 0;

	int ret = 0;



	if (w->reg == WCD9335_ANA_LO_1_2) {

		if (w->shift == 7) {
@@ -3837,7 +3831,7 @@ static int wcd9335_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static void wcd9335_codec_init_flyback(struct snd_soc_component *component)
@@ -3892,7 +3886,6 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	struct wcd9335_codec *wcd = dev_get_drvdata(comp->dev);

	int hph_mode = wcd->hph_mode;

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:
@@ -3930,14 +3923,13 @@ static int wcd9335_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w,

				       struct snd_kcontrol *kc, int event)

{

	struct snd_soc_component *comp = snd_soc_dapm_to_component(w->dapm);

	int ret = 0;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:
@@ -3967,7 +3959,7 @@ static int wcd9335_codec_enable_ear_pa(struct snd_soc_dapm_widget *w, 
		break;

	};



	return ret;

	return 0;

}



static irqreturn_t wcd9335_slimbus_irq(int irq, void *data)

sound/soc/fsl/fsl_sai.c

+19 −2
Original line number Diff line number Diff line
@@ -137,6 +137,16 @@ static int fsl_sai_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, 
	return 0;

}



static int fsl_sai_set_dai_bclk_ratio(struct snd_soc_dai *dai,

				      unsigned int ratio)

{

	struct fsl_sai *sai = snd_soc_dai_get_drvdata(dai);



	sai->bclk_ratio = ratio;



	return 0;

}



static int fsl_sai_set_dai_sysclk_tr(struct snd_soc_dai *cpu_dai,

		int clk_id, unsigned int freq, int fsl_dir)

{
@@ -423,8 +433,14 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, 
		slot_width = sai->slot_width;



	if (!sai->is_slave_mode) {

		if (sai->bclk_ratio)

			ret = fsl_sai_set_bclk(cpu_dai, tx,

					       sai->bclk_ratio *

					       params_rate(params));

		else

			ret = fsl_sai_set_bclk(cpu_dai, tx,

				slots * slot_width * params_rate(params));

					       slots * slot_width *

					       params_rate(params));

		if (ret)

			return ret;
@@ -630,6 +646,7 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream, 
}



static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {

	.set_bclk_ratio	= fsl_sai_set_dai_bclk_ratio,

	.set_sysclk	= fsl_sai_set_dai_sysclk,

	.set_fmt	= fsl_sai_set_dai_fmt,

	.set_tdm_slot	= fsl_sai_set_dai_tdm_slot,

sound/soc/fsl/fsl_sai.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ struct fsl_sai { 
	unsigned int mclk_streams;

	unsigned int slots;

	unsigned int slot_width;

	unsigned int bclk_ratio;



	const struct fsl_sai_soc_data *soc_data;

	struct snd_dmaengine_dai_dma_data dma_params_rx;

sound/soc/qcom/sdm845.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static void sdm845_snd_shutdown(struct snd_pcm_substream *substream) 
			snd_soc_dai_set_sysclk(cpu_dai,

				Q6AFE_LPASS_CLK_ID_PRI_MI2S_IBIT,

				0, SNDRV_PCM_STREAM_PLAYBACK);

		};

		}

		break;



	case SECONDARY_MI2S_TX:

sound/soc/soc-generic-dmaengine-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) 
			pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE;



		if (rtd->pcm->streams[i].pcm->name[0] == '\0') {

			strncpy(rtd->pcm->streams[i].pcm->name,

			strscpy_pad(rtd->pcm->streams[i].pcm->name,

				    rtd->pcm->streams[i].pcm->id,

				    sizeof(rtd->pcm->streams[i].pcm->name));

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE