luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200415202816.934-23-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2020-04-15 15:28:14 -05:00 committed by Mark Brown
parent 15bf1831fc
commit 18aaab64fb
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/sof/dai-intel.h
View File

@ -88,6 +88,8 @@ struct sof_ipc_dai_ssp_params {
struct sof_ipc_dai_hda_params { struct sof_ipc_dai_hda_params {
struct sof_ipc_hdr hdr; struct sof_ipc_hdr hdr;
uint32_t link_dma_ch; uint32_t link_dma_ch;
uint32_t rate;
uint32_t channels;
} __packed; } __packed;
/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */ /* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */

2
include/uapi/sound/sof/abi.h
View File

@ -26,7 +26,7 @@
/* SOF ABI version major, minor and patch numbers */ /* SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3 #define SOF_ABI_MAJOR 3
#define SOF_ABI_MINOR 15 #define SOF_ABI_MINOR 16
#define SOF_ABI_PATCH 0 #define SOF_ABI_PATCH 0
/* SOF ABI version number. Format within 32bit word is MMmmmppp */ /* SOF ABI version number. Format within 32bit word is MMmmmppp */

4
include/uapi/sound/sof/tokens.h
View File

@ -130,4 +130,8 @@
#define SOF_TKN_INTEL_ALH_RATE 1400 #define SOF_TKN_INTEL_ALH_RATE 1400
#define SOF_TKN_INTEL_ALH_CH 1401 #define SOF_TKN_INTEL_ALH_CH 1401
/* HDA */
#define SOF_TKN_INTEL_HDA_RATE 1500
#define SOF_TKN_INTEL_HDA_CH 1501
#endif #endif

9
sound/soc/sof/topology.c
View File

@ -753,6 +753,12 @@ static const struct sof_topology_token dmic_pdm_tokens[] = {
/* HDA */ /* HDA */
static const struct sof_topology_token hda_tokens[] = { 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 */ /* Leds */
@ -3083,6 +3089,9 @@ static int sof_link_hda_load(struct snd_soc_component *scomp, int index,
return ret; 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); dai = snd_soc_find_dai(link->cpus);
if (!dai) { if (!dai) {
dev_err(scomp->dev, "error: failed to find dai %s in %s", dev_err(scomp->dev, "error: failed to find dai %s in %s",