ASoC: Intel: avs: Honor NHLT override when setting up a path

In case topology provides NHLT configuration, use it instead of relying on the table in ACPI tree. Only gateway-related modules e.g.: Copier care about the process. For those the order of fetching for hardware configuration becomes: 1) check if NHLT override is set, 2) check if NHLT descriptor override is set, 3) use NHLT from ACPI directly Such approach ensures no conflicts exist between 1) and 2) and that 1) always takes precedence.

Cezary Rojewski committed 12 months ago

Commit d5c8b791 parent dd9896d4 files · +18 −4Browse files

Showing the changes to include/uapi (1 of 4 files). Show all

Unified · Split

include/uapi/sound/intel/avs/tokens.h+1−0

@@ -125,6 +125,7 @@ enum avs_tplg_token { · 124 unmodified lines
125	AVS_TKN_MOD_KCONTROL_ID_U32 = 1707,	125	AVS_TKN_MOD_KCONTROL_ID_U32 = 1707,
126	AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32 = 1708,	126	AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32 = 1708,
127	AVS_TKN_MOD_INIT_CONFIG_ID_U32 = 1709,	127	AVS_TKN_MOD_INIT_CONFIG_ID_U32 = 1709,
		128	AVS_TKN_MOD_NHLT_CONFIG_ID_U32 = 1710,
128		129
129	/* struct avs_tplg_path_template */	130	/* struct avs_tplg_path_template */
130	AVS_TKN_PATH_TMPL_ID_U32 = 1801,	131	AVS_TKN_PATH_TMPL_ID_U32 = 1801,