Unverified Commit 18aaab64 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: SOF: topology: Get HDA rate and channels from topology 



FW interface for HDA DAI parameters was extended with information on
sampling rate and channel count in version 3.16. Align kernel header
with the FW change. This change is backwards compatible. Old firmware
will ignore the values.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200415202816.934-23-pierre-louis.bossart@linux.intel.com


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

include/sound/sof/dai-intel.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ struct sof_ipc_dai_ssp_params { 
struct sof_ipc_dai_hda_params {

	struct sof_ipc_hdr hdr;

	uint32_t link_dma_ch;

	uint32_t rate;

	uint32_t channels;

} __packed;



/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */

include/uapi/sound/sof/abi.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


/* SOF ABI version major, minor and patch numbers */

#define SOF_ABI_MAJOR 3

#define SOF_ABI_MINOR 15

#define SOF_ABI_MINOR 16

#define SOF_ABI_PATCH 0



/* SOF ABI version number. Format within 32bit word is MMmmmppp */

include/uapi/sound/sof/tokens.h

+4 −0
Original line number Diff line number Diff line
@@ -130,4 +130,8 @@ 
#define SOF_TKN_INTEL_ALH_RATE			1400

#define SOF_TKN_INTEL_ALH_CH			1401



/* HDA */

#define SOF_TKN_INTEL_HDA_RATE			1500

#define SOF_TKN_INTEL_HDA_CH			1501



#endif

sound/soc/sof/topology.c

+9 −0
Original line number Diff line number Diff line
@@ -753,6 +753,12 @@ static const struct sof_topology_token dmic_pdm_tokens[] = { 


/* HDA */

static const struct sof_topology_token hda_tokens[] = {

	{SOF_TKN_INTEL_HDA_RATE,

		SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc_dai_hda_params, rate), 0},

	{SOF_TKN_INTEL_HDA_CH,

		SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,

		offsetof(struct sof_ipc_dai_hda_params, channels), 0},

};



/* Leds */
@@ -3083,6 +3089,9 @@ static int sof_link_hda_load(struct snd_soc_component *scomp, int index, 
		return ret;

	}



	dev_dbg(scomp->dev, "HDA config rate %d channels %d\n",

		config->hda.rate, config->hda.channels);



	dai = snd_soc_find_dai(link->cpus);

	if (!dai) {

		dev_err(scomp->dev, "error: failed to find dai %s in %s",

CRA Git | Maintained and supported by SUSTech CRA and CCSE