summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-12-07 17:33:09 +0100
committerTakashi Iwai <tiwai@suse.de>2011-12-07 17:33:09 +0100
commitffe7e4063987678c00589717d7871f837c6e7300 (patch)
tree1aeee46780d9f7601909a4baa5f0c766c555e2e2 /Documentation/sound
parent9eb6e9b16f86ef94f05427bd7fc84d521aa57169 (diff)
parent0a34b42b6245ccc710be6759cded5b7fe41ea1f9 (diff)
downloadop-kernel-dev-ffe7e4063987678c00589717d7871f837c6e7300.zip
op-kernel-dev-ffe7e4063987678c00589717d7871f837c6e7300.tar.gz
Merge branch 'fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_realtek.c
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/soc/machine.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt
index 3e2ec9c..d50c14d 100644
--- a/Documentation/sound/alsa/soc/machine.txt
+++ b/Documentation/sound/alsa/soc/machine.txt
@@ -50,8 +50,7 @@ Machine DAI Configuration
The machine DAI configuration glues all the codec and CPU DAIs together. It can
also be used to set up the DAI system clock and for any machine related DAI
initialisation e.g. the machine audio map can be connected to the codec audio
-map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c
-for examples.
+map, unconnected codec pins can be set as such.
struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -83,8 +82,7 @@ Machine Power Map
The machine driver can optionally extend the codec power map and to become an
audio power map of the audio subsystem. This allows for automatic power up/down
of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack
-sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for
-details.
+sockets in the machine init function.
Machine Controls
OpenPOWER on IntegriCloud