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
76 uint16_t tdm_per_slot_padding_flag;76 uint16_t tdm_per_slot_padding_flag;
77 uint32_t clks_control;77 uint32_t clks_control;
78 uint32_t quirks;78 uint32_t quirks;
79 uint32_t bclk_delay; /* guaranteed time (ms) for which BCLK
80 * will be driven, before sending data
81 */
79} __packed;82} __packed;
80 83
81/* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */84/* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */
@@ -176,4 +179,13 @@ struct sof_ipc_dai_dmic_params { · 94 unmodified lines
176 struct sof_ipc_dai_dmic_pdm_ctrl pdm[0];179 struct sof_ipc_dai_dmic_pdm_ctrl pdm[0];
177} __packed;180} __packed;
178 181
182/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */
183struct 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
179#endif191#endif
include/sound/sof/dai.h+4−1
@@ -49,7 +49,9 @@ enum sof_ipc_dai_type { · 48 unmodified lines
49 SOF_DAI_INTEL_SSP, /**< Intel SSP */49 SOF_DAI_INTEL_SSP, /**< Intel SSP */
50 SOF_DAI_INTEL_DMIC, /**< Intel DMIC */50 SOF_DAI_INTEL_DMIC, /**< Intel DMIC */
51 SOF_DAI_INTEL_HDA, /**< Intel HD/A */51 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 */
53};55};
54 56
55/* general purpose DAI configuration */57/* general purpose DAI configuration */
@@ -70,6 +72,7 @@ struct sof_ipc_dai_config { · 14 unmodified lines
70 struct sof_ipc_dai_ssp_params ssp;72 struct sof_ipc_dai_ssp_params ssp;
71 struct sof_ipc_dai_dmic_params dmic;73 struct sof_ipc_dai_dmic_params dmic;
72 struct sof_ipc_dai_hda_params hda;74 struct sof_ipc_dai_hda_params hda;
75 struct sof_ipc_dai_alh_params alh;
73 };76 };
74} __packed;77} __packed;
75 78