diff options
| author | Matt LaPlante <kernel1@cyberdogtech.com> | 2007-10-19 19:34:40 -0400 |
|---|---|---|
| committer | Adrian Bunk <bunk@kernel.org> | 2007-10-19 19:34:40 -0400 |
| commit | 01dd2fbf0da4019c380b6ca22a074538fb31db5a (patch) | |
| tree | 210291bd341c4450c8c51d8db890af0978f4035d /Documentation/sound/alsa/soc/DAI.txt | |
| parent | 0f035b8e8491f4ff87f6eec3e3f754d36b39d7a2 (diff) | |
typo fixes
Most of these fixes were already submitted for old kernel versions, and were
approved, but for some reason they never made it into the releases.
Because this is a consolidation of a couple old missed patches, it touches both
Kconfigs and documentation texts.
Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Diffstat (limited to 'Documentation/sound/alsa/soc/DAI.txt')
| -rw-r--r-- | Documentation/sound/alsa/soc/DAI.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/alsa/soc/DAI.txt index 58cbfd01ea8f..3feeb9ecdec4 100644 --- a/Documentation/sound/alsa/soc/DAI.txt +++ b/Documentation/sound/alsa/soc/DAI.txt | |||
| @@ -20,12 +20,12 @@ I2S | |||
| 20 | === | 20 | === |
| 21 | 21 | ||
| 22 | I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and | 22 | I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and |
| 23 | Rx lines are used for audio transmision, whilst the bit clock (BCLK) and | 23 | Rx lines are used for audio transmission, whilst the bit clock (BCLK) and |
| 24 | left/right clock (LRC) synchronise the link. I2S is flexible in that either the | 24 | left/right clock (LRC) synchronise the link. I2S is flexible in that either the |
| 25 | controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock | 25 | controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock |
| 26 | usually varies depending on the sample rate and the master system clock | 26 | usually varies depending on the sample rate and the master system clock |
| 27 | (SYSCLK). LRCLK is the same as the sample rate. A few devices support separate | 27 | (SYSCLK). LRCLK is the same as the sample rate. A few devices support separate |
| 28 | ADC and DAC LRCLK's, this allows for similtanious capture and playback at | 28 | ADC and DAC LRCLK's, this allows for simultaneous capture and playback at |
| 29 | different sample rates. | 29 | different sample rates. |
| 30 | 30 | ||
| 31 | I2S has several different operating modes:- | 31 | I2S has several different operating modes:- |
| @@ -41,12 +41,12 @@ I2S has several different operating modes:- | |||
| 41 | PCM | 41 | PCM |
| 42 | === | 42 | === |
| 43 | 43 | ||
| 44 | PCM is another 4 wire interface, very similar to I2S, that can support a more | 44 | PCM is another 4 wire interface, very similar to I2S, which can support a more |
| 45 | flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used | 45 | flexible protocol. It has bit clock (BCLK) and sync (SYNC) lines that are used |
| 46 | to synchronise the link whilst the Tx and Rx lines are used to transmit and | 46 | to synchronise the link whilst the Tx and Rx lines are used to transmit and |
| 47 | receive the audio data. Bit clock usually varies depending on sample rate | 47 | receive the audio data. Bit clock usually varies depending on sample rate |
| 48 | whilst sync runs at the sample rate. PCM also supports Time Division | 48 | whilst sync runs at the sample rate. PCM also supports Time Division |
| 49 | Multiplexing (TDM) in that several devices can use the bus similtaniuosly (This | 49 | Multiplexing (TDM) in that several devices can use the bus simultaneously (this |
| 50 | is sometimes referred to as network mode). | 50 | is sometimes referred to as network mode). |
| 51 | 51 | ||
| 52 | Common PCM operating modes:- | 52 | Common PCM operating modes:- |