diff options
author | 2022-11-29 12:55:12 +0000 | |
---|---|---|
committer | 2022-11-29 12:55:51 +0000 | |
commit | aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64 (patch) | |
tree | 3d80758082c0a3bc293761cc1a4cbac2e457b128 /include/sound/sof | |
parent | ASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() (diff) | |
parent | ASoC: cs42l51: Correct PGA Volume minimum value (diff) | |
download | linux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.gz linux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.bz2 linux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.zip |
ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
Diffstat (limited to 'include/sound/sof')
-rw-r--r-- | include/sound/sof/dai.h | 2 | ||||
-rw-r--r-- | include/sound/sof/info.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h index 83fd81c82e4c..9fbd3832bcdc 100644 --- a/include/sound/sof/dai.h +++ b/include/sound/sof/dai.h @@ -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 */ diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 65e86e4e9fd8..75193850ead0 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -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; |