Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
a2760e4b36
|
@ -50,8 +50,7 @@ Machine DAI Configuration
|
||||||
The machine DAI configuration glues all the codec and CPU DAIs together. It can
|
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
|
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
|
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
|
map, unconnected codec pins can be set as such.
|
||||||
for examples.
|
|
||||||
|
|
||||||
struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
|
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
|
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
|
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
|
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
|
sockets in the machine init function.
|
||||||
details.
|
|
||||||
|
|
||||||
|
|
||||||
Machine Controls
|
Machine Controls
|
||||||
|
|
Loading…
Reference in New Issue