Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: Intel: board_helpers: support DAI link array generation

Browse Source 
Add a helper function for machine drivers to initialize dai_link and
num_links of a snd_soc_card structure. Machine driver needs to
initialize sof_card_private structure in driver probe function then
board_helpers module will create entire DAI link array for this board.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231127152654.28204-26-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brent Lu 2023-11-27 17:26:52 +02:00 committed by Mark Brown
parent ee2486d521
commit a6881210f1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
sound/soc/intel/boards/sof_board_helpers.c
View File

@ -375,6 +375,158 @@ int sof_intel_board_set_hdmi_in_link(struct device *dev,
}
EXPORT_SYMBOL_NS(sof_intel_board_set_hdmi_in_link, SND_SOC_INTEL_SOF_BOARD_HELPERS);
static int calculate_num_links(struct sof_card_private *ctx)
{
int num_links = 0;
/* headphone codec */
if (ctx->codec_type != CODEC_NONE)
num_links++;
/* dmic01 and dmic16k */
if (ctx->dmic_be_num > 0)
num_links++;
if (ctx->dmic_be_num > 1)
num_links++;
/* idisp HDMI */
num_links += ctx->hdmi_num;
/* speaker amp */
if (ctx->amp_type != CODEC_NONE)
num_links++;
/* BT audio offload */
if (ctx->bt_offload_present)
num_links++;
/* HDMI-In */
num_links += hweight32(ctx->ssp_mask_hdmi_in);
return num_links;
}
int sof_intel_board_set_dai_link(struct device *dev, struct snd_soc_card *card,
struct sof_card_private *ctx)
{
struct snd_soc_dai_link *links;
int num_links;
int i;
int idx = 0;
int ret;
int ssp_hdmi_in = 0;
num_links = calculate_num_links(ctx);
links = devm_kcalloc(dev, num_links, sizeof(struct snd_soc_dai_link),
GFP_KERNEL);
if (!links)
return -ENOMEM;
/* headphone codec */
if (ctx->codec_type != CODEC_NONE) {
ret = sof_intel_board_set_codec_link(dev, &links[idx], idx,
ctx->codec_type,
ctx->ssp_codec);
if (ret) {
dev_err(dev, "fail to set codec link, ret %d\n", ret);
return ret;
}
ctx->codec_link = &links[idx];
idx++;
}
/* dmic01 and dmic16k */
if (ctx->dmic_be_num > 0) {
/* at least we have dmic01 */
ret = sof_intel_board_set_dmic_link(dev, &links[idx], idx,
SOF_DMIC_01);
if (ret) {
dev_err(dev, "fail to set dmic01 link, ret %d\n", ret);
return ret;
}
idx++;
}
if (ctx->dmic_be_num > 1) {
/* set up 2 BE links at most */
ret = sof_intel_board_set_dmic_link(dev, &links[idx], idx,
SOF_DMIC_16K);
if (ret) {
dev_err(dev, "fail to set dmic16k link, ret %d\n", ret);
return ret;
}
idx++;
}
/* idisp HDMI */
for (i = 1; i <= ctx->hdmi_num; i++) {
ret = sof_intel_board_set_intel_hdmi_link(dev, &links[idx], idx,
i,
ctx->hdmi.idisp_codec);
if (ret) {
dev_err(dev, "fail to set hdmi link, ret %d\n", ret);
return ret;
}
idx++;
}
/* speaker amp */
if (ctx->amp_type != CODEC_NONE) {
ret = sof_intel_board_set_ssp_amp_link(dev, &links[idx], idx,
ctx->amp_type,
ctx->ssp_amp);
if (ret) {
dev_err(dev, "fail to set amp link, ret %d\n", ret);
return ret;
}
ctx->amp_link = &links[idx];
idx++;
}
/* BT audio offload */
if (ctx->bt_offload_present) {
ret = sof_intel_board_set_bt_link(dev, &links[idx], idx,
ctx->ssp_bt);
if (ret) {
dev_err(dev, "fail to set bt link, ret %d\n", ret);
return ret;
}
idx++;
}
/* HDMI-In */
for_each_set_bit(ssp_hdmi_in, &ctx->ssp_mask_hdmi_in, 32) {
ret = sof_intel_board_set_hdmi_in_link(dev, &links[idx], idx,
ssp_hdmi_in);
if (ret) {
dev_err(dev, "fail to set hdmi-in link, ret %d\n", ret);
return ret;
}
idx++;
}
if (idx != num_links) {
dev_err(dev, "link number mismatch, idx %d, num_links %d\n", idx,
num_links);
return -EINVAL;
}
card->dai_link = links;
card->num_links = num_links;
return 0;
}
EXPORT_SYMBOL_NS(sof_intel_board_set_dai_link, SND_SOC_INTEL_SOF_BOARD_HELPERS);
MODULE_DESCRIPTION("ASoC Intel SOF Machine Driver Board Helpers");
MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
MODULE_LICENSE("GPL");

7
sound/soc/intel/boards/sof_board_helpers.h
View File

@ -35,6 +35,8 @@ struct sof_rt5682_private {
* @ssp_bt: ssp port number of BT offload BE link
* @ssp_mask_hdmi_in: ssp port mask of HDMI-IN BE link
* @bt_offload_present: true to create BT offload BE link
* @codec_link: pointer to headset codec dai link
* @amp_link: pointer to speaker amplifier dai link
* @rt5682: private data for rt5682 machine driver
*/
struct sof_card_private {
@ -54,6 +56,9 @@ struct sof_card_private {
bool bt_offload_present;
struct snd_soc_dai_link *codec_link;
struct snd_soc_dai_link *amp_link;
union {
struct sof_rt5682_private rt5682;
};
@ -65,6 +70,8 @@ enum sof_dmic_be_type {
};
int sof_intel_board_card_late_probe(struct snd_soc_card *card);
int sof_intel_board_set_dai_link(struct device *dev, struct snd_soc_card *card,
struct sof_card_private *ctx);
int sof_intel_board_set_codec_link(struct device *dev,
struct snd_soc_dai_link *link, int be_id,