All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cezary Rojewski <cezary.rojewski@intel.com>
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
	pierre-louis.bossart@linux.intel.com, tiwai@suse.com,
	hdegoede@redhat.com, amadeuszx.slawinski@linux.intel.com
Subject: [PATCH 02/12] ASoC: Intel: avs: Assign I2S gateway when parsing topology
Date: Thu,  7 Jul 2022 14:41:43 +0200	[thread overview]
Message-ID: <20220707124153.1858249-3-cezary.rojewski@intel.com> (raw)
In-Reply-To: <20220707124153.1858249-1-cezary.rojewski@intel.com>

For formatted port - ssp%d - descriptions to have an effect, copier
module templates need to be updated with specified port value. This
value is later propagated to the firmware when module instances are
being instantiated.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/topology.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c
index 6a06fe387d13..8a9f9fc48938 100644
--- a/sound/soc/intel/avs/topology.c
+++ b/sound/soc/intel/avs/topology.c
@@ -808,6 +808,30 @@ static const struct avs_tplg_token_parser pin_format_parsers[] = {
 	},
 };
 
+static void
+assign_copier_gtw_instance(struct snd_soc_component *comp, struct avs_tplg_modcfg_ext *cfg)
+{
+	struct snd_soc_acpi_mach *mach;
+
+	if (!guid_equal(&cfg->type, &AVS_COPIER_MOD_UUID))
+		return;
+
+	/* Only I2S boards assign port instance in ->i2s_link_mask. */
+	switch (cfg->copier.dma_type) {
+	case AVS_DMA_I2S_LINK_OUTPUT:
+	case AVS_DMA_I2S_LINK_INPUT:
+		break;
+	default:
+		return;
+	}
+
+	mach = dev_get_platdata(comp->card->dev);
+
+	/* Automatic assignment only when board describes single SSP. */
+	if (hweight_long(mach->mach_params.i2s_link_mask) == 1 && !cfg->copier.vindex.i2s.instance)
+		cfg->copier.vindex.i2s.instance = __ffs(mach->mach_params.i2s_link_mask);
+}
+
 static int avs_tplg_parse_modcfg_ext(struct snd_soc_component *comp,
 				     struct avs_tplg_modcfg_ext *cfg,
 				     struct snd_soc_tplg_vendor_array *tuples,
@@ -827,6 +851,9 @@ static int avs_tplg_parse_modcfg_ext(struct snd_soc_component *comp,
 	if (ret)
 		return ret;
 
+	/* Update copier gateway based on board's i2s_link_mask. */
+	assign_copier_gtw_instance(comp, cfg);
+
 	block_size -= esize;
 	/* Parse trailing in/out pin formats if any. */
 	if (block_size) {
-- 
2.25.1


  parent reply	other threads:[~2022-07-07 12:33 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07 12:41 [PATCH 00/12] ASoC: Intel: avs: Updates and cleanups Cezary Rojewski
2022-07-07 12:41 ` [PATCH 01/12] ASoC: Intel: avs: Register HDAudio ext-bus operations Cezary Rojewski
2022-07-07 12:41 ` Cezary Rojewski [this message]
2022-07-07 12:41 ` [PATCH 03/12] ASoC: Intel: avs: Relax DSP core transition timings Cezary Rojewski
2022-07-07 12:41 ` [PATCH 04/12] ASoC: Intel: avs: Copy only as many RX bytes as necessary Cezary Rojewski
2022-07-07 12:41 ` [PATCH 05/12] ASoC: Intel: avs: Shield LARGE_CONFIG_GETs against zero payload_size Cezary Rojewski
2022-07-07 12:41 ` [PATCH 06/12] ASoC: Intel: avs: Block IPC channel on suspend Cezary Rojewski
2022-07-08 17:28   ` Mark Brown
2022-07-09  8:29     ` Cezary Rojewski
2022-07-07 12:41 ` [PATCH 07/12] ASoC: Intel: avs: Set max DMA segment size Cezary Rojewski
2022-07-07 12:41 ` [PATCH 08/12] ASoC: Intel: avs: Use helper function to set up DMA Cezary Rojewski
2022-07-07 12:41 ` [PATCH 09/12] ASoC: Intel: avs: Recognize FW_CFG_RESERVED Cezary Rojewski
2022-07-07 12:41 ` [PATCH 10/12] ASoC: Intel: avs: Replace hardcodes with SD_CTL_STREAM_RESET Cezary Rojewski
2022-07-07 12:41 ` [PATCH 11/12] ASoC: Intel: avs: Lower UNLOAD_MULTIPLE_MODULES IPC timeout Cezary Rojewski
2022-07-07 12:41 ` [PATCH 12/12] ASoC: Intel: avs: Update AVS_FW_INIT_TIMEOUT_US declaration Cezary Rojewski
2022-07-11 21:14 ` [PATCH 00/12] ASoC: Intel: avs: Updates and cleanups 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=20220707124153.1858249-3-cezary.rojewski@intel.com \
    --to=cezary.rojewski@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=amadeuszx.slawinski@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=tiwai@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.