|
@@ -350,13 +350,28 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,
|
|
struct snd_interval *channels = hw_param_interval(params,
|
|
struct snd_interval *channels = hw_param_interval(params,
|
|
SNDRV_PCM_HW_PARAM_CHANNELS);
|
|
SNDRV_PCM_HW_PARAM_CHANNELS);
|
|
struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
|
|
struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
|
|
|
|
+ struct snd_soc_dpcm *dpcm = container_of(
|
|
|
|
+ params, struct snd_soc_dpcm, hw_params);
|
|
|
|
+ struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link;
|
|
|
|
+ struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link;
|
|
|
|
|
|
- /* The ADSP will convert the FE rate to 48k, stereo */
|
|
|
|
- rate->min = rate->max = 48000;
|
|
|
|
- channels->min = channels->max = 2;
|
|
|
|
- /* set SSP1 to 24 bit */
|
|
|
|
- snd_mask_none(fmt);
|
|
|
|
- snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
|
|
|
|
|
|
+ /*
|
|
|
|
+ * The ADSP will convert the FE rate to 48k, stereo, 24 bit
|
|
|
|
+ */
|
|
|
|
+ if (!strcmp(fe_dai_link->name, "Kbl Audio Port") ||
|
|
|
|
+ !strcmp(fe_dai_link->name, "Kbl Audio Headset Playback") ||
|
|
|
|
+ !strcmp(fe_dai_link->name, "Kbl Audio Capture Port")) {
|
|
|
|
+ rate->min = rate->max = 48000;
|
|
|
|
+ channels->min = channels->max = 2;
|
|
|
|
+ snd_mask_none(fmt);
|
|
|
|
+ snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
|
|
|
|
+ }
|
|
|
|
+ /*
|
|
|
|
+ * The speaker on the SSP0 supports S16_LE and not S24_LE.
|
|
|
|
+ * thus changing the mask here
|
|
|
|
+ */
|
|
|
|
+ if (!strcmp(be_dai_link->name, "SSP0-Codec"))
|
|
|
|
+ snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|