summaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa
diff options
context:
space:
mode:
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>2013-09-20 19:19:08 +0200
committerMark Brown <broonie@linaro.org>2013-09-23 13:06:25 +0200
commitb5c47df974ddae44d4a1ff935cdda30b0795bc00 (patch)
tree5a3aff92de5c28873f4ea62e5687d90bf38e4446 /Documentation/sound/alsa
parentASoC: Docs: update DAPM (diff)
downloadlinux-b5c47df974ddae44d4a1ff935cdda30b0795bc00.tar.xz
linux-b5c47df974ddae44d4a1ff935cdda30b0795bc00.zip
ASoC: Docs: Machine update
Update the machine driver documentation and bring it up to date with the current code base. This includes multi component. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'Documentation/sound/alsa')
-rw-r--r--Documentation/sound/alsa/soc/machine.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt
index d50c14df3411..74056dba52be 100644
--- a/Documentation/sound/alsa/soc/machine.txt
+++ b/Documentation/sound/alsa/soc/machine.txt
@@ -1,8 +1,10 @@
ASoC Machine Driver
===================
-The ASoC machine (or board) driver is the code that glues together the platform
-and codec drivers.
+The ASoC machine (or board) driver is the code that glues together all the
+component drivers (e.g. codecs, platforms and DAIs). It also describes the
+relationships between each componnent which include audio paths, GPIOs,
+interrupts, clocking, jacks and voltage regulators.
The machine driver can contain codec and platform specific code. It registers
the audio subsystem with the kernel as a platform device and is represented by