History

Merge branch 'asoc-5.4' into asoc-next

Mark Brown committed 7 years ago

Commit bb831782 parents 6652ddb 6fa5963272 files · +12110 −6853Browse files

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

Unified · Split

2 files
  1. include/sound/sof/dai-intel.h +12 −0
  2. include/sound/sof/dai.h +4 −1
include/sound/sof/dai-intel.h+12−0
@@ -76,6 +76,9 @@ struct sof_ipc_dai_ssp_params { · 75 unmodified lines
7676 uint16_t tdm_per_slot_padding_flag;
7777 uint32_t clks_control;
7878 uint32_t quirks;
79+ uint32_t bclk_delay; /* guaranteed time (ms) for which BCLK
80+ * will be driven, before sending data
81+ */
7982 } __packed;
8083
8184 /* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */
@@ -176,4 +179,13 @@ struct sof_ipc_dai_dmic_params { · 94 unmodified lines
176179 struct sof_ipc_dai_dmic_pdm_ctrl pdm[0];
177180 } __packed;
178181
182+/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */
183+struct sof_ipc_dai_alh_params {
184+ struct sof_ipc_hdr hdr;
185+ uint32_t stream_id;
186+
187+ /* reserved for future use */
188+ uint32_t reserved[15];
189+} __packed;
190+
179191 #endif
include/sound/sof/dai.h+4−1
@@ -49,7 +49,9 @@ enum sof_ipc_dai_type { · 48 unmodified lines
4949 SOF_DAI_INTEL_SSP, /**< Intel SSP */
5050 SOF_DAI_INTEL_DMIC, /**< Intel DMIC */
5151 SOF_DAI_INTEL_HDA, /**< Intel HD/A */
52− SOF_DAI_INTEL_SOUNDWIRE, /**< Intel SoundWire */
52+ SOF_DAI_INTEL_ALH, /**< Intel ALH */
53+ SOF_DAI_IMX_SAI, /**< i.MX SAI */
54+ SOF_DAI_IMX_ESAI, /**< i.MX ESAI */
5355 };
5456
5557 /* general purpose DAI configuration */
@@ -70,6 +72,7 @@ struct sof_ipc_dai_config { · 14 unmodified lines
7072 struct sof_ipc_dai_ssp_params ssp;
7173 struct sof_ipc_dai_dmic_params dmic;
7274 struct sof_ipc_dai_hda_params hda;
75+ struct sof_ipc_dai_alh_params alh;
7376 };
7477 } __packed;
7578