Unverified Commit 8c05246c authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: add min/max channels for SSP on Baytrail/Broadwell 



Major regressions were detected by SOF CI on CherryTrail and Broadwell:

[   25.705750]  SSP2-Codec: ASoC: no backend playback stream
[   27.923378]  SSP2-Codec: ASoC: no users playback at close - state

This is root-caused to the introduction of the DAI capability checks
with snd_soc_dai_stream_valid(). Its use in soc-pcm.c makes it a
requirement for all DAIs to report at least a non-zero min_channels
field.

For some reason the SSP structures used for SKL+ did provide this
information but legacy platforms didn't.

Fixes: 9b5db059 ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200417172014.11760-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e2bcb657

sound/soc/sof/intel/bdw.c

+16 −0
Original line number Diff line number Diff line
@@ -567,9 +567,25 @@ static void bdw_set_mach_params(const struct snd_soc_acpi_mach *mach, 
static struct snd_soc_dai_driver bdw_dai[] = {

{

	.name = "ssp0-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "ssp1-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

};

sound/soc/sof/intel/byt.c

+48 −0
Original line number Diff line number Diff line
@@ -459,21 +459,69 @@ static void byt_set_mach_params(const struct snd_soc_acpi_mach *mach, 
static struct snd_soc_dai_driver byt_dai[] = {

{

	.name = "ssp0-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "ssp1-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "ssp2-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	}

},

{

	.name = "ssp3-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "ssp4-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

{

	.name = "ssp5-port",

	.playback = {

		.channels_min = 1,

		.channels_max = 8,

	},

	.capture = {

		.channels_min = 1,

		.channels_max = 8,

	},

},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE