aboutsummaryrefslogtreecommitdiff
path: root/Documentation/sound
diff options
context:
space:
mode:
authorGravatar Luca Ceresoli <luca.ceresoli@bootlin.com> 2024-04-26 18:56:43 +0200
committerGravatar Mark Brown <broonie@kernel.org> 2024-04-29 23:49:34 +0900
commit057acfb460d6792c7d3ec088f57c411fb0e4d395 (patch)
tree460ccd6b3b140cd7db497a3539a75afae675d342 /Documentation/sound
parentASoC: doc: dapm: fix and improve section "Registering DAPM controls" (diff)
downloadlinux-057acfb460d6792c7d3ec088f57c411fb0e4d395.tar.gz
linux-057acfb460d6792c7d3ec088f57c411fb0e4d395.tar.bz2
linux-057acfb460d6792c7d3ec088f57c411fb0e4d395.zip
ASoC: doc: dapm: improve section "Codec/DSP Widget Interconnections"
Improve wording in a few places, cleanup ReST colon syntax, remove space before colon, and remove the "codec" parameter in the parentheses of snd_soc_dapm_new_widgets() (there should be no parameters in the docs, and that function takes a card, not a codec). Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Link: https://lore.kernel.org/r/20240426-dapm-docs-v2-10-87b07547eb5b@bootlin.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/soc/dapm.rst19
1 files changed, 8 insertions, 11 deletions
diff --git a/Documentation/sound/soc/dapm.rst b/Documentation/sound/soc/dapm.rst
index 50f908f4e8ed..8fccdb0d6454 100644
--- a/Documentation/sound/soc/dapm.rst
+++ b/Documentation/sound/soc/dapm.rst
@@ -306,25 +306,23 @@ This is easiest with a diagram of the codec or DSP (and schematic of the machine
audio system), as it requires joining widgets together via their audio signal
paths.
-e.g., from the WM8731 output mixer (wm8731.c)
-
-The WM8731 output mixer has 3 inputs (sources)
+For example the WM8731 output mixer (wm8731.c) has 3 inputs (sources):
1. Line Bypass Input
2. DAC (HiFi playback)
3. Mic Sidetone Input
-Each input in this example has a kcontrol associated with it (defined in example
-above) and is connected to the output mixer via its kcontrol name. We can now
-connect the destination widget (wrt audio signal) with its source widgets.
-::
+Each input in this example has a kcontrol associated with it (defined in
+the example above) and is connected to the output mixer via its kcontrol
+name. We can now connect the destination widget (wrt audio signal) with its
+source widgets. ::
/* output mixer */
{"Output Mixer", "Line Bypass Switch", "Line Input"},
{"Output Mixer", "HiFi Playback Switch", "DAC"},
{"Output Mixer", "Mic Sidetone Switch", "Mic Bias"},
-So we have :
+So we have:
* Destination Widget <=== Path Name <=== Source Widget, or
* Sink, Path, Source, or
@@ -333,12 +331,11 @@ So we have :
When there is no path name connecting widgets (e.g. a direct connection) we
pass NULL for the path name.
-Interconnections are created with a call to:
-::
+Interconnections are created with a call to::
snd_soc_dapm_connect_input(codec, sink, path, source);
-Finally, snd_soc_dapm_new_widgets(codec) must be called after all widgets and
+Finally, snd_soc_dapm_new_widgets() must be called after all widgets and
interconnections have been registered with the core. This causes the core to
scan the codec and machine so that the internal DAPM state matches the
physical state of the machine.