Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: SOF: align topology header file with sof topology header

Add missed definition and align variable names with sof topology
header file.

Signed-off-by: Baofeng Tian <baofeng.tian@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231204214713.208951-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Baofeng Tian and committed by
Mark Brown
6c4df324 2f039701

+16 -9
+16 -9
include/sound/sof/topology.h
··· 39 39 SOF_COMP_ASRC, /**< Asynchronous sample rate converter */ 40 40 SOF_COMP_DCBLOCK, 41 41 SOF_COMP_SMART_AMP, /**< smart amplifier component */ 42 + SOF_COMP_MODULE_ADAPTER, /**< module adapter */ 42 43 /* keep FILEREAD/FILEWRITE as the last ones */ 43 44 SOF_COMP_FILEREAD = 10000, /**< host test based file IO */ 44 45 SOF_COMP_FILEWRITE = 10001, /**< host test based file IO */ ··· 69 68 /* 70 69 * SOF memory capabilities, add new ones at the end 71 70 */ 72 - #define SOF_MEM_CAPS_RAM (1 << 0) 73 - #define SOF_MEM_CAPS_ROM (1 << 1) 74 - #define SOF_MEM_CAPS_EXT (1 << 2) /**< external */ 75 - #define SOF_MEM_CAPS_LP (1 << 3) /**< low power */ 76 - #define SOF_MEM_CAPS_HP (1 << 4) /**< high performance */ 77 - #define SOF_MEM_CAPS_DMA (1 << 5) /**< DMA'able */ 78 - #define SOF_MEM_CAPS_CACHE (1 << 6) /**< cacheable */ 79 - #define SOF_MEM_CAPS_EXEC (1 << 7) /**< executable */ 71 + #define SOF_MEM_CAPS_RAM BIT(0) 72 + #define SOF_MEM_CAPS_ROM BIT(1) 73 + #define SOF_MEM_CAPS_EXT BIT(2) /**< external */ 74 + #define SOF_MEM_CAPS_LP BIT(3) /**< low power */ 75 + #define SOF_MEM_CAPS_HP BIT(4) /**< high performance */ 76 + #define SOF_MEM_CAPS_DMA BIT(5) /**< DMA'able */ 77 + #define SOF_MEM_CAPS_CACHE BIT(6) /**< cacheable */ 78 + #define SOF_MEM_CAPS_EXEC BIT(7) /**< executable */ 79 + #define SOF_MEM_CAPS_L3 BIT(8) /**< L3 memory */ 80 80 81 81 /* 82 82 * overrun will cause ring buffer overwrite, instead of XRUN. ··· 88 86 * underrun will cause readback of 0s, instead of XRUN. 89 87 */ 90 88 #define SOF_BUF_UNDERRUN_PERMITTED BIT(1) 89 + 90 + /* the UUID size in bytes, shared between FW and host */ 91 + #define SOF_UUID_SIZE 16 91 92 92 93 /* create new component buffer - SOF_IPC_TPLG_BUFFER_NEW */ 93 94 struct sof_ipc_buffer { ··· 145 140 SOF_VOLUME_LOG, 146 141 SOF_VOLUME_LINEAR_ZC, 147 142 SOF_VOLUME_LOG_ZC, 143 + SOF_VOLUME_WINDOWS_FADE, 144 + SOF_VOLUME_WINDOWS_NO_FADE, 148 145 }; 149 146 150 147 /* generic volume component */ ··· 241 234 /* reserved for future use */ 242 235 uint32_t reserved[7]; 243 236 244 - uint8_t data[]; 237 + unsigned char data[]; 245 238 } __packed; 246 239 247 240 /* frees components, buffers and pipelines