Unverified Commit 613733f0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents bb176f67 d1c4cb44

sound/soc/intel/boards/cht_bsw_max98090_ti.c

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
		return ret;

	}



	fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF

	fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				| SND_SOC_DAIFMT_CBS_CFS;



	ret = snd_soc_dai_set_fmt(rtd->cpu_dai, fmt);
@@ -173,8 +173,8 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
	rate->min = rate->max = 48000;

	channels->min = channels->max = 2;



	/* set SSP2 to 24-bit */

	params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);

	/* set SSP2 to 16-bit */

	params_set_format(params, SNDRV_PCM_FORMAT_S16_LE);

	return 0;

}

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+2 −0
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) 


	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {

		codec = pcm->codec_dai->codec;

		snprintf(jack_name, sizeof(jack_name),

			"HDMI/DP, pcm=%d Jack", pcm->device);

		err = snd_soc_card_jack_new(card, jack_name,

				SND_JACK_AVOUT, &ctx->kabylake_hdmi[i],

				NULL, 0);

sound/soc/intel/skylake/skl-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -2382,7 +2382,7 @@ static int skl_tplg_get_token(struct device *dev, 
	case SKL_TKN_U32_MAX_MCPS:

	case SKL_TKN_U32_OBS:

	case SKL_TKN_U32_IBS:

		ret = skl_tplg_fill_res_tkn(dev, tkn_elem, res, dir, pin_index);

		ret = skl_tplg_fill_res_tkn(dev, tkn_elem, res, pin_index, dir);

		if (ret < 0)

			return ret;