From: Luca Ceresoli <luca.ceresoli@bootlin.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Jonathan Corbet <corbet@lwn.net>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-sound@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Luca Ceresoli <luca.ceresoli@bootlin.com>
Subject: [PATCH v2 08/12] ASoC: doc: dapm: describe how widgets and routes are registered
Date: Fri, 26 Apr 2024 18:56:41 +0200 [thread overview]
Message-ID: <20240426-dapm-docs-v2-8-87b07547eb5b@bootlin.com> (raw)
In-Reply-To: <20240426-dapm-docs-v2-0-87b07547eb5b@bootlin.com>
The small paragraph describing how to register widgets is incomplete (does
not mention routes) and mentions snd_soc_dapm_new_control() which is not
really used. Moreover it appears as a part of the "Virtual Widgets"
subsection.
Replace it with a detailed and current description of how widgets and
routes are registered, mentioning both static declaration and runtime
registration. Also make this a section on its own.
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
---
Documentation/sound/soc/dapm.rst | 38 ++++++++++++++++++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
diff --git a/Documentation/sound/soc/dapm.rst b/Documentation/sound/soc/dapm.rst
index 58ef880ac8b6..4b094c3d7942 100644
--- a/Documentation/sound/soc/dapm.rst
+++ b/Documentation/sound/soc/dapm.rst
@@ -251,8 +251,42 @@ a virtual widget - a widget with no control bits e.g.
This can be used to merge two signal paths together in software.
-After all the widgets have been defined, they can then be added to the DAPM
-subsystem individually with a call to snd_soc_dapm_new_control().
+Registering DAPM controls
+=========================
+
+In many cases the DAPM widgets implemented statically in a ``static const
+struct snd_soc_dapm_widget`` array and the routes connecting them in a
+``static const struct snd_soc_dapm_route`` array in a codec driver, and
+simply declared via the ``dapm_widgets`` and ``num_dapm_widgets`` fields of
+the ``struct snd_soc_component_driver`` so the driver registration will
+take care of populating them::
+
+ static const struct snd_soc_dapm_widget wm2000_dapm_widgets[] = {
+ SND_SOC_DAPM_OUTPUT("SPKN"),
+ SND_SOC_DAPM_OUTPUT("SPKP"),
+ ...
+ };
+
+ /* Target, Path, Source */
+ static const struct snd_soc_dapm_route wm2000_audio_map[] = {
+ { "SPKN", NULL, "ANC Engine" },
+ { "SPKP", NULL, "ANC Engine" },
+ ...
+ };
+
+ static const struct snd_soc_component_driver soc_component_dev_wm2000 = {
+ ...
+ .dapm_widgets = wm2000_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(wm2000_dapm_widgets),
+ ...
+ };
+
+In more complex cases the list of DAPM widgets and/or routes can be only
+known at build time. This happens for example when a driver supports
+different models having a different set of features. In those cases
+separate widgets and routes arrays implementing the case-specific features
+can be registered programmatically by calling snd_soc_dapm_new_controls()
+and snd_soc_dapm_add_routes().
Codec/DSP Widget Interconnections
--
2.34.1
next prev parent reply other threads:[~2024-04-26 16:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 16:56 [PATCH v2 00/12] ASoC: doc: dapm: various improvements Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 01/12] ASoC: doc: dapm: fix typos Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 02/12] ASoC: doc: dapm: fix struct name Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 03/12] ASoC: doc: dapm: minor rewording Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 04/12] ASoC: doc: dapm: remove dash after colon Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 05/12] ASoC: doc: dapm: clarify it's an internal API Luca Ceresoli
2024-04-29 14:42 ` Mark Brown
2024-04-26 16:56 ` [PATCH v2 06/12] ASoC: doc: dapm: replace "map" with "graph" Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 07/12] ASoC: doc: dapm: extend initial descrption Luca Ceresoli
2024-04-26 16:56 ` Luca Ceresoli [this message]
2024-04-26 16:56 ` [PATCH v2 09/12] ASoC: doc: dapm: fix and improve section "Registering DAPM controls" Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 10/12] ASoC: doc: dapm: improve section "Codec/DSP Widget Interconnections" Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 11/12] ASoC: doc: dapm: update section "DAPM Widget Events" Luca Ceresoli
2024-04-26 16:56 ` [PATCH v2 12/12] ASoC: doc: dapm: update event types Luca Ceresoli
2024-05-01 13:43 ` (subset) [PATCH v2 00/12] ASoC: doc: dapm: various improvements 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=20240426-dapm-docs-v2-8-87b07547eb5b@bootlin.com \
--to=luca.ceresoli@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=bagasdotme@gmail.com \
--cc=broonie@kernel.org \
--cc=corbet@lwn.net \
--cc=lgirdwood@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=thomas.petazzoni@bootlin.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.