diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-11-10 16:17:40 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-11-11 11:33:16 -0500 |
commit | e732d1bcd452a040a18242d555996703465c1ca7 (patch) | |
tree | 025657f7362b67f651ca0807ffd80f425609264e | |
parent | 693ba474a39a2c22e1576995139c9bfdd8b554c8 (diff) |
ASoC: doc: ReSTize DAI.txt
A simple conversion from a plain text file with slight reformatting /
corrections.
The file name was changed to lower letters to align with others.
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | Documentation/sound/soc/dai.rst (renamed from Documentation/sound/alsa/soc/DAI.txt) | 28 | ||||
-rw-r--r-- | Documentation/sound/soc/index.rst | 1 |
2 files changed, 19 insertions, 10 deletions
diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/soc/dai.rst index c9679264c559..55820e51708f 100644 --- a/Documentation/sound/alsa/soc/DAI.txt +++ b/Documentation/sound/soc/dai.rst | |||
@@ -1,3 +1,7 @@ | |||
1 | ================================== | ||
2 | ASoC Digital Audio Interface (DAI) | ||
3 | ================================== | ||
4 | |||
1 | ASoC currently supports the three main Digital Audio Interfaces (DAI) found on | 5 | ASoC currently supports the three main Digital Audio Interfaces (DAI) found on |
2 | SoC controllers and portable audio CODECs today, namely AC97, I2S and PCM. | 6 | SoC controllers and portable audio CODECs today, namely AC97, I2S and PCM. |
3 | 7 | ||
@@ -5,21 +9,21 @@ SoC controllers and portable audio CODECs today, namely AC97, I2S and PCM. | |||
5 | AC97 | 9 | AC97 |
6 | ==== | 10 | ==== |
7 | 11 | ||
8 | AC97 is a five wire interface commonly found on many PC sound cards. It is | 12 | AC97 is a five wire interface commonly found on many PC sound cards. It is |
9 | now also popular in many portable devices. This DAI has a reset line and time | 13 | now also popular in many portable devices. This DAI has a reset line and time |
10 | multiplexes its data on its SDATA_OUT (playback) and SDATA_IN (capture) lines. | 14 | multiplexes its data on its SDATA_OUT (playback) and SDATA_IN (capture) lines. |
11 | The bit clock (BCLK) is always driven by the CODEC (usually 12.288MHz) and the | 15 | The bit clock (BCLK) is always driven by the CODEC (usually 12.288MHz) and the |
12 | frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97 | 16 | frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97 |
13 | frame is 21uS long and is divided into 13 time slots. | 17 | frame is 21uS long and is divided into 13 time slots. |
14 | 18 | ||
15 | The AC97 specification can be found at :- | 19 | The AC97 specification can be found at : |
16 | http://www.intel.com/p/en_US/business/design | 20 | http://www.intel.com/p/en_US/business/design |
17 | 21 | ||
18 | 22 | ||
19 | I2S | 23 | I2S |
20 | === | 24 | === |
21 | 25 | ||
22 | I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and | 26 | I2S is a common 4 wire DAI used in HiFi, STB and portable devices. The Tx and |
23 | Rx lines are used for audio transmission, whilst the bit clock (BCLK) and | 27 | 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 | 28 | 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 | 29 | controller or CODEC can drive (master) the BCLK and LRC clock lines. Bit clock |
@@ -30,13 +34,15 @@ different sample rates. | |||
30 | 34 | ||
31 | I2S has several different operating modes:- | 35 | I2S has several different operating modes:- |
32 | 36 | ||
33 | o I2S - MSB is transmitted on the falling edge of the first BCLK after LRC | 37 | I2S |
34 | transition. | 38 | MSB is transmitted on the falling edge of the first BCLK after LRC |
39 | transition. | ||
35 | 40 | ||
36 | o Left Justified - MSB is transmitted on transition of LRC. | 41 | Left Justified |
42 | MSB is transmitted on transition of LRC. | ||
37 | 43 | ||
38 | o Right Justified - MSB is transmitted sample size BCLKs before LRC | 44 | Right Justified |
39 | transition. | 45 | MSB is transmitted sample size BCLKs before LRC transition. |
40 | 46 | ||
41 | PCM | 47 | PCM |
42 | === | 48 | === |
@@ -51,6 +57,8 @@ is sometimes referred to as network mode). | |||
51 | 57 | ||
52 | Common PCM operating modes:- | 58 | Common PCM operating modes:- |
53 | 59 | ||
54 | o Mode A - MSB is transmitted on falling edge of first BCLK after FRAME/SYNC. | 60 | Mode A |
61 | MSB is transmitted on falling edge of first BCLK after FRAME/SYNC. | ||
55 | 62 | ||
56 | o Mode B - MSB is transmitted on rising edge of FRAME/SYNC. | 63 | Mode B |
64 | MSB is transmitted on rising edge of FRAME/SYNC. | ||
diff --git a/Documentation/sound/soc/index.rst b/Documentation/sound/soc/index.rst index a2e023c91df2..aea7ae7e5aad 100644 --- a/Documentation/sound/soc/index.rst +++ b/Documentation/sound/soc/index.rst | |||
@@ -9,3 +9,4 @@ The documentation is spilt into the following sections:- | |||
9 | 9 | ||
10 | overview | 10 | overview |
11 | codec | 11 | codec |
12 | dai | ||