aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa/soc/machine.txt
diff options
context:
space:
mode:
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 d50c14df341..3e2ec9cbf39 100644
--- a/Documentation/sound/alsa/soc/machine.txt
+++ b/Documentation/sound/alsa/soc/machine.txt
@@ -50,7 +50,8 @@ Machine DAI Configuration
50The machine DAI configuration glues all the codec and CPU DAIs together. It can 50The machine DAI configuration glues all the codec and CPU DAIs together. It can
51also be used to set up the DAI system clock and for any machine related DAI 51also be used to set up the DAI system clock and for any machine related DAI
52initialisation e.g. the machine audio map can be connected to the codec audio 52initialisation e.g. the machine audio map can be connected to the codec audio
53map, unconnected codec pins can be set as such. 53map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c
54for examples.
54 55
55struct snd_soc_dai_link is used to set up each DAI in your machine. e.g. 56struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
56 57
@@ -82,7 +83,8 @@ Machine Power Map
82The machine driver can optionally extend the codec power map and to become an 83The machine driver can optionally extend the codec power map and to become an
83audio power map of the audio subsystem. This allows for automatic power up/down 84audio power map of the audio subsystem. This allows for automatic power up/down
84of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack 85of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack
85sockets in the machine init function. 86sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for
87details.
86 88
87 89
88Machine Controls 90Machine Controls