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 06/27] ASoC: Intel: board_helpers: support codec link initialization
Date: Mon, 27 Nov 2023 17:26:33 +0200	[thread overview]
Message-ID: <20231127152654.28204-7-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 headphone
codec DAI links. The function will initialize common fields and let
caller to initialize codec-specific fields like codec, init, exit, and
ops fields.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 sound/soc/intel/boards/sof_board_helpers.c | 51 ++++++++++++++++++++++
 sound/soc/intel/boards/sof_board_helpers.h |  6 +++
 2 files changed, 57 insertions(+)

diff --git a/sound/soc/intel/boards/sof_board_helpers.c b/sound/soc/intel/boards/sof_board_helpers.c
index ce2967850c2d..5ee53c781b37 100644
--- a/sound/soc/intel/boards/sof_board_helpers.c
+++ b/sound/soc/intel/boards/sof_board_helpers.c
@@ -3,6 +3,7 @@
 // Copyright(c) 2023 Intel Corporation. All rights reserved.
 
 #include <sound/soc.h>
+#include "../common/soc-intel-quirks.h"
 #include "hda_dsp_common.h"
 #include "sof_board_helpers.h"
 
@@ -86,6 +87,55 @@ static struct snd_soc_dai_link_component platform_component[] = {
 	}
 };
 
+int sof_intel_board_set_codec_link(struct device *dev,
+				   struct snd_soc_dai_link *link, int be_id,
+				   enum sof_ssp_codec codec_type, int ssp_codec)
+{
+	struct snd_soc_dai_link_component *cpus;
+
+	dev_dbg(dev, "link %d: codec %s, ssp %d\n", be_id,
+		sof_ssp_get_codec_name(codec_type), ssp_codec);
+
+	/* link name */
+	link->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_codec);
+	if (!link->name)
+		return -ENOMEM;
+
+	/* cpus */
+	cpus = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link_component),
+			    GFP_KERNEL);
+	if (!cpus)
+		return -ENOMEM;
+
+	if (soc_intel_is_byt() || soc_intel_is_cht()) {
+		/* backward-compatibility for BYT/CHT boards */
+		cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "ssp%d-port",
+						ssp_codec);
+	} else {
+		cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin",
+						ssp_codec);
+	}
+	if (!cpus->dai_name)
+		return -ENOMEM;
+
+	link->cpus = cpus;
+	link->num_cpus = 1;
+
+	/* codecs - caller to handle */
+
+	/* platforms */
+	link->platforms = platform_component;
+	link->num_platforms = ARRAY_SIZE(platform_component);
+
+	link->id = be_id;
+	link->no_pcm = 1;
+	link->dpcm_capture = 1;
+	link->dpcm_playback = 1;
+
+	return 0;
+}
+EXPORT_SYMBOL_NS(sof_intel_board_set_codec_link, SND_SOC_INTEL_SOF_BOARD_HELPERS);
+
 int sof_intel_board_set_dmic_link(struct device *dev,
 				  struct snd_soc_dai_link *link, int be_id,
 				  enum sof_dmic_be_type be_type)
@@ -202,3 +252,4 @@ MODULE_DESCRIPTION("ASoC Intel SOF Machine Driver Board Helpers");
 MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");
 MODULE_LICENSE("GPL");
 MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);
+MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_SSP_COMMON);
diff --git a/sound/soc/intel/boards/sof_board_helpers.h b/sound/soc/intel/boards/sof_board_helpers.h
index df99f576c1d8..7392d639672d 100644
--- a/sound/soc/intel/boards/sof_board_helpers.h
+++ b/sound/soc/intel/boards/sof_board_helpers.h
@@ -30,6 +30,7 @@ struct sof_rt5682_private {
  * @amp_type: type of speaker amplifier
  * @dmic_be_num: number of Intel PCH DMIC BE link
  * @hdmi_num: number of Intel HDMI BE link
+ * @ssp_codec: ssp port number of headphone BE link
  * @rt5682: private data for rt5682 machine driver
  */
 struct sof_card_private {
@@ -42,6 +43,8 @@ struct sof_card_private {
 	int dmic_be_num;
 	int hdmi_num;
 
+	int ssp_codec;
+
 	union {
 		struct sof_rt5682_private rt5682;
 	};
@@ -54,6 +57,9 @@ enum sof_dmic_be_type {
 
 int sof_intel_board_card_late_probe(struct snd_soc_card *card);
 
+int sof_intel_board_set_codec_link(struct device *dev,
+				   struct snd_soc_dai_link *link, int be_id,
+				   enum sof_ssp_codec codec_type, int ssp_codec);
 int sof_intel_board_set_dmic_link(struct device *dev,
 				  struct snd_soc_dai_link *link, int be_id,
 				  enum sof_dmic_be_type be_type);
-- 
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 ` Peter Ujfalusi [this message]
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 ` [PATCH 25/27] ASoC: Intel: board_helpers: support DAI link array generation Peter Ujfalusi
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-7-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