summaryrefslogtreecommitdiff
path: root/Documentation/sound/alsa/soc/machine.txt
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:24:05 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:24:05 +0100
commit9f7a949fb909b017e054574c96c4ebb44f5ff3fa (patch)
tree58aa069ba011a9ef626f30a61cfcdd1ac520b1b8 /Documentation/sound/alsa/soc/machine.txt
parent70e0db2f7434961c778466708c032e76775b7f1e (diff)
parent469b7bc4e6dbfdb173f0901f746e9277f6740ba7 (diff)
Merge remote-tracking branch 'asoc/topic/doc' into asoc-next
Diffstat (limited to 'Documentation/sound/alsa/soc/machine.txt')
-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