diff options
| author | Mark Brown <[email protected]> | 2020-03-13 16:17:01 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2020-03-13 16:17:01 +0000 |
| commit | bd2b34e485f2361655c6020aa2d3bf2a14ae9dff (patch) | |
| tree | ddec594a677c0b14ff9d40fa8b1e1651db2bf6c1 /include | |
| parent | ccab2c7dfe0f0382e87d63052b9988d466bc8b9e (diff) | |
| parent | c59aca98c912e570e907b448d4f1b1b49ef9572e (diff) | |
Merge series "ASoC: SOF: multi-cpu dais, IPC and Intel improvements for 5.7" from Pierre-Louis Bossart <[email protected]>:
Corrections for compatibility with the multi-cpu dai check for
min-channels, IPC simplifications, and removal of unnecessary
boot-related code for Intel platforms.
Amery Song (2):
ASoC: SOF: Intel: hda: remove unnecessary ROM IPC filter function
ASoC: SOF: Intel: remove unnecessary waitq before loading firmware
Bard Liao (2):
ASoC: SOF: Intel: hda-dai: add stream capability
ASoC: SOF: topology: connect dai widget to all cpu-dais
Karol Trzcinski (2):
ASoC: SOF: Make sof_ipc_ext_data enum more rigid
ASoC: SOF: Remove SOF_IPC_EXT_DMA_BUFFER
include/sound/sof/info.h | 22 +-------
sound/soc/sof/intel/cnl.c | 5 --
sound/soc/sof/intel/hda-dai.c | 96 ++++++++++++++++++++++++++++++++
sound/soc/sof/intel/hda-ipc.c | 20 +------
sound/soc/sof/intel/hda-loader.c | 3 -
sound/soc/sof/intel/hda.c | 3 -
sound/soc/sof/intel/hda.h | 1 -
sound/soc/sof/loader.c | 6 --
sound/soc/sof/sof-priv.h | 5 --
sound/soc/sof/topology.c | 8 ++-
10 files changed, 108 insertions(+), 61 deletions(-)
base-commit: 101247a3b86e1cc0e382b7e887a56176290fc957
--
2.20.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sof/info.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 1c560144996c..438a11fcf272 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -28,9 +28,9 @@ /* extended data types that can be appended onto end of sof_ipc_fw_ready */ enum sof_ipc_ext_data { - SOF_IPC_EXT_DMA_BUFFER = 0, - SOF_IPC_EXT_WINDOW, - SOF_IPC_EXT_CC_INFO, + SOF_IPC_EXT_UNUSED = 0, + SOF_IPC_EXT_WINDOW = 1, + SOF_IPC_EXT_CC_INFO = 2, }; /* FW version - SOF_IPC_GLB_VERSION */ @@ -83,22 +83,6 @@ struct sof_ipc_ext_data_hdr { uint32_t type; /**< SOF_IPC_EXT_ */ } __packed; -struct sof_ipc_dma_buffer_elem { - struct sof_ipc_hdr hdr; - uint32_t type; /**< SOF_IPC_REGION_ */ - uint32_t id; /**< platform specific - used to map to host memory */ - struct sof_ipc_host_buffer buffer; -} __packed; - -/* extended data DMA buffers for IPC, trace and debug */ -struct sof_ipc_dma_buffer_data { - struct sof_ipc_ext_data_hdr ext_hdr; - uint32_t num_buffers; - - /* host files in buffer[n].buffer */ - struct sof_ipc_dma_buffer_elem buffer[]; -} __packed; - struct sof_ipc_window_elem { struct sof_ipc_hdr hdr; uint32_t type; /**< SOF_IPC_REGION_ */ |