public inbox for linux-sound@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
To: lgirdwood@gmail.com, broonie@kernel.org
Cc: alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
	pierre-louis.bossart@linux.intel.com,
	kai.vehmanen@linux.intel.com, ranjani.sridharan@linux.intel.com,
	yung-chuan.liao@linux.intel.com, chao.song@linux.intel.com
Subject: [PATCH 25/27] ASoC: Intel: board_helpers: support DAI link array generation
Date: Mon, 27 Nov 2023 17:26:52 +0200	[thread overview]
Message-ID: <20231127152654.28204-26-peter.ujfalusi@linux.intel.com> (raw)
In-Reply-To: <20231127152654.28204-1-peter.ujfalusi@linux.intel.com>

From: Brent Lu <brent.lu@intel.com>

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>
---
 sound/soc/intel/boards/sof_board_helpers.c | 152 +++++++++++++++++++++
 sound/soc/intel/boards/sof_board_helpers.h |   7 +
 2 files changed, 159 insertions(+)

diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c
index a1dba1f45669..4f2cb8e52971 100644
--- a/sound/soc/intel/boards/sof_board_helpers.c
+++ b/sound/soc/intel/boards/sof_board_helpers.c
@@ -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");
diff --git a/sound/soc/intel/boards/sof_board_helpers.h b/sound/soc/intel/boards/sof_board_helpers.h
index a4bae62a4ed5..3b36058118ca 100644
--- a/sound/soc/intel/boards/sof_board_helpers.h
+++ b/sound/soc/intel/boards/sof_board_helpers.h
@@ -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,
-- 
2.43.0


  parent reply	other threads:[~2023-11-27 15:35 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-27 15:26 [PATCH 00/27] ASoC: Intel: Link handling rework and fixes Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 01/27] ASoC: Intel: sof_ssp_amp: remove dead code Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 02/27] ASoC: Intel: sof_maxim_common: add else between 2 if test Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 03/27] ASoC: Intel: sof_maxim_common: check return value Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 04/27] ASoC: Intel: cht_bsw_rt5672: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 05/27] ASoC: Intel: ssp-common: get codec name function Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 06/27] ASoC: Intel: board_helpers: support codec link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 07/27] ASoC: Intel: sof_cs42l42: use common module for codec link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 08/27] ASoC: Intel: sof_nau8825: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 09/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 10/27] ASoC: Intel: board_helpers: support amp link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 11/27] ASoC: Intel: sof_cs42l42: use common module for amp link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 12/27] ASoC: Intel: sof_nau8825: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 13/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 14/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 15/27] ASoC: Intel: sof_ssp_amp: rename function parameter Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 16/27] ASoC: Intel: board_helpers: support BT offload link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 17/27] ASoC: Intel: sof_cs42l42: use common module for BT offload link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 18/27] ASoC: Intel: sof_nau8825: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 19/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 20/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 21/27] ASoC: Intel: sof_ssp_amp: simplify HDMI-In quirks Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 22/27] ASoC: Intel: board_helpers: support HDMI-In link initialization Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 23/27] ASoC: Intel: sof_rt5682: use common module for HDMI-In link Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 24/27] ASoC: Intel: sof_ssp_amp: " Peter Ujfalusi
2023-11-27 15:26 ` Peter Ujfalusi [this message]
2023-11-27 15:26 ` [PATCH 26/27] ASoC: Intel: sof_nau8825: use common module for DAI link generation Peter Ujfalusi
2023-11-27 15:26 ` [PATCH 27/27] ASoC: Intel: sof_rt5682: " Peter Ujfalusi
2023-11-28 13:55 ` [PATCH 00/27] ASoC: Intel: Link handling rework and fixes Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231127152654.28204-26-peter.ujfalusi@linux.intel.com \
    --to=peter.ujfalusi@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=chao.song@linux.intel.com \
    --cc=kai.vehmanen@linux.intel.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-sound@vger.kernel.org \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=yung-chuan.liao@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox