ASoC: Merge up fixes

Merge the fixes branch up so we can apply further AMD work.

Mark Brown committed 3 years ago

Commit aeb2e9c2 parents 863b917 3d1bb6c35 files · +223 −108Browse files

Showing the changes to include/sound/sof (2 of 35 files). Show all

Unified · Split

2 files

@@ -84,8 +84,8 @@ enum sof_ipc_dai_type { · 83 unmodified lines
84	84	SOF_DAI_AMD_BT, /*< AMD ACP BT/
85	85	SOF_DAI_AMD_SP, /*< AMD ACP SP /
86	86	SOF_DAI_AMD_DMIC, /*< AMD ACP DMIC /
87		− SOF_DAI_AMD_HS, /*< Amd HS /
88	87	SOF_DAI_MEDIATEK_AFE, /*< Mediatek AFE /
	88	+ SOF_DAI_AMD_HS, /*< Amd HS /
89	89	};
90	90
91	91	/* general purpose DAI configuration */

@@ -36,6 +36,10 @@ enum sof_ipc_ext_data { · 35 unmodified lines
36	36	SOF_IPC_EXT_USER_ABI_INFO = 4,
37	37	};
38	38
	39	+/* Build u32 number in format MMmmmppp */
	40	+#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \
	41	+ ((MAJOR) << 24) \| ((MINOR) << 12) \| (PATCH)))
	42	+
39	43	/* FW version - SOF_IPC_GLB_VERSION */
40	44	struct sof_ipc_fw_version {
41	45	struct sof_ipc_hdr hdr;