ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
This commit is contained in:
commit
aeb2e9c4ee
35 changed files with 224 additions and 109 deletions
|
|
@ -84,8 +84,8 @@ enum sof_ipc_dai_type {
|
|||
SOF_DAI_AMD_BT, /**< AMD ACP BT*/
|
||||
SOF_DAI_AMD_SP, /**< AMD ACP SP */
|
||||
SOF_DAI_AMD_DMIC, /**< AMD ACP DMIC */
|
||||
SOF_DAI_AMD_HS, /**< Amd HS */
|
||||
SOF_DAI_MEDIATEK_AFE, /**< Mediatek AFE */
|
||||
SOF_DAI_AMD_HS, /**< Amd HS */
|
||||
};
|
||||
|
||||
/* general purpose DAI configuration */
|
||||
|
|
|
|||
|
|
@ -36,6 +36,10 @@ enum sof_ipc_ext_data {
|
|||
SOF_IPC_EXT_USER_ABI_INFO = 4,
|
||||
};
|
||||
|
||||
/* Build u32 number in format MMmmmppp */
|
||||
#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \
|
||||
((MAJOR) << 24) | ((MINOR) << 12) | (PATCH)))
|
||||
|
||||
/* FW version - SOF_IPC_GLB_VERSION */
|
||||
struct sof_ipc_fw_version {
|
||||
struct sof_ipc_hdr hdr;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue