Merge branch 'asoc-5.4' into asoc-next
This commit is contained in:
@@ -76,6 +76,9 @@ struct sof_ipc_dai_ssp_params {
|
||||
uint16_t tdm_per_slot_padding_flag;
|
||||
uint32_t clks_control;
|
||||
uint32_t quirks;
|
||||
uint32_t bclk_delay; /* guaranteed time (ms) for which BCLK
|
||||
* will be driven, before sending data
|
||||
*/
|
||||
} __packed;
|
||||
|
||||
/* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */
|
||||
@@ -176,4 +179,13 @@ struct sof_ipc_dai_dmic_params {
|
||||
struct sof_ipc_dai_dmic_pdm_ctrl pdm[0];
|
||||
} __packed;
|
||||
|
||||
/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */
|
||||
struct sof_ipc_dai_alh_params {
|
||||
struct sof_ipc_hdr hdr;
|
||||
uint32_t stream_id;
|
||||
|
||||
/* reserved for future use */
|
||||
uint32_t reserved[15];
|
||||
} __packed;
|
||||
|
||||
#endif
|
||||
|
@@ -49,7 +49,9 @@ enum sof_ipc_dai_type {
|
||||
SOF_DAI_INTEL_SSP, /**< Intel SSP */
|
||||
SOF_DAI_INTEL_DMIC, /**< Intel DMIC */
|
||||
SOF_DAI_INTEL_HDA, /**< Intel HD/A */
|
||||
SOF_DAI_INTEL_SOUNDWIRE, /**< Intel SoundWire */
|
||||
SOF_DAI_INTEL_ALH, /**< Intel ALH */
|
||||
SOF_DAI_IMX_SAI, /**< i.MX SAI */
|
||||
SOF_DAI_IMX_ESAI, /**< i.MX ESAI */
|
||||
};
|
||||
|
||||
/* general purpose DAI configuration */
|
||||
@@ -70,6 +72,7 @@ struct sof_ipc_dai_config {
|
||||
struct sof_ipc_dai_ssp_params ssp;
|
||||
struct sof_ipc_dai_dmic_params dmic;
|
||||
struct sof_ipc_dai_hda_params hda;
|
||||
struct sof_ipc_dai_alh_params alh;
|
||||
};
|
||||
} __packed;
|
||||
|
||||
|
Reference in New Issue
Block a user