3 files changed, 45 insertions, 45 deletions
diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
index 59193b6b5572..9df4fb3ea0f2 100644
--- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -280,7 +280,7 @@ Description
 Param[0]
        Bitmask:
             0:1  Data size:
-                      '00' 16 bit
+                      '00' 16 bit
                      '01' 20 bit
                      '10' 24 bit
             2:7  Unused
@@ -292,9 +292,9 @@ Param[0]
                           (for left justified MSB first mode, 20 bit only)
            10:11 Unused
            12:13 Channel format:
-                      '00' right justified MSB first mode
+                      '00' right justified MSB first mode
-                      '01' left justified MSB first mode
+                      '01' left justified MSB first mode
-                      '10' I2S mode
+                      '10' I2S mode
            14:15 Unused
            16:21 Right justify bit count
            22:31 Unused
diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 64cd111349ad..08ee9f5303f9 100644
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -281,64 +281,64 @@ Description
 Param[0]
        Bitmask:
           0:1  '00' 44.1Khz
-                '01' 48Khz
+                '01' 48Khz
-                '10' 32Khz
+                '10' 32Khz
-                '11' reserved
+                '11' reserved
           2:3  '01'=Layer I
                '10'=Layer II
           4:7  Bitrate:
-                     Index | Layer I     | Layer II
+                     Index | Layer I     | Layer II
-                     ------+-------------+------------
+                     ------+-------------+------------
-                    '0000' | free format | free format
+                    '0000' | free format | free format
-                    '0001' |  32 kbit/s  |  32 kbit/s
+                    '0001' |  32 kbit/s  |  32 kbit/s
-                    '0010' |  64 kbit/s  |  48 kbit/s
+                    '0010' |  64 kbit/s  |  48 kbit/s
-                    '0011' |  96 kbit/s  |  56 kbit/s
+                    '0011' |  96 kbit/s  |  56 kbit/s
-                    '0100' | 128 kbit/s  |  64 kbit/s
+                    '0100' | 128 kbit/s  |  64 kbit/s
-                    '0101' | 160 kbit/s  |  80 kbit/s
+                    '0101' | 160 kbit/s  |  80 kbit/s
-                    '0110' | 192 kbit/s  |  96 kbit/s
+                    '0110' | 192 kbit/s  |  96 kbit/s
-                    '0111' | 224 kbit/s  | 112 kbit/s
+                    '0111' | 224 kbit/s  | 112 kbit/s
-                    '1000' | 256 kbit/s  | 128 kbit/s
+                    '1000' | 256 kbit/s  | 128 kbit/s
-                    '1001' | 288 kbit/s  | 160 kbit/s
+                    '1001' | 288 kbit/s  | 160 kbit/s
-                    '1010' | 320 kbit/s  | 192 kbit/s
+                    '1010' | 320 kbit/s  | 192 kbit/s
-                    '1011' | 352 kbit/s  | 224 kbit/s
+                    '1011' | 352 kbit/s  | 224 kbit/s
-                    '1100' | 384 kbit/s  | 256 kbit/s
+                    '1100' | 384 kbit/s  | 256 kbit/s
-                    '1101' | 416 kbit/s  | 320 kbit/s
+                    '1101' | 416 kbit/s  | 320 kbit/s
-                    '1110' | 448 kbit/s  | 384 kbit/s
+                    '1110' | 448 kbit/s  | 384 kbit/s
-                Note: For Layer II, not all combinations of total bitrate
+                Note: For Layer II, not all combinations of total bitrate
-                and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
+                and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
           8:9  '00'=Stereo
-                '01'=JointStereo
+                '01'=JointStereo
-                '10'=Dual
+                '10'=Dual
-                '11'=Mono
+                '11'=Mono
          10:11 Mode Extension used in joint_stereo mode.
-                In Layer I and II they indicate which subbands are in
+                In Layer I and II they indicate which subbands are in
                intensity_stereo. All other subbands are coded in stereo.
-                    '00' subbands 4-31 in intensity_stereo, bound==4
+                    '00' subbands 4-31 in intensity_stereo, bound==4
-                    '01' subbands 8-31 in intensity_stereo, bound==8
+                    '01' subbands 8-31 in intensity_stereo, bound==8
-                    '10' subbands 12-31 in intensity_stereo, bound==12
+                    '10' subbands 12-31 in intensity_stereo, bound==12
-                    '11' subbands 16-31 in intensity_stereo, bound==16
+                    '11' subbands 16-31 in intensity_stereo, bound==16
          12:13 Emphasis:
-                    '00' None
+                    '00' None
-                    '01' 50/15uS
+                    '01' 50/15uS
-                    '10' reserved
+                    '10' reserved
-                    '11' CCITT J.17
+                    '11' CCITT J.17
          14    CRC:
-                    '0' off
+                    '0' off
-                    '1' on
+                    '1' on
          15    Copyright:
-                    '0' off
+                    '0' off
-                    '1' on
+                    '1' on
          16    Generation:
-                    '0' copy
+                    '0' copy
-                    '1' original
+                    '1' original
 -------------------------------------------------------------------------------
diff --git a/Documentation/video4linux/cx2341x/fw-memory.txt b/Documentation/video4linux/cx2341x/fw-memory.txt
index 336d8208ef3b..ef0aad3f88fc 100644
--- a/Documentation/video4linux/cx2341x/fw-memory.txt
+++ b/Documentation/video4linux/cx2341x/fw-memory.txt
@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff:
        if changed to 0xffffffff DMA write interrupts break.
 0x50 - always 0xffffffff
 0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are
-        3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
+        3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
        interrupt masks???).
 0x60-0x7C - random values
 0x80 - first write linked list reg, for Encoder Memory addr

diff --git a/Documentation/video4linux/cx2341x/fw-decoder-api.txt b/Documentation/video4linux/cx2341x/fw-decoder-api.txt index 59193b6b5572..9df4fb3ea0f2 100644 --- a/Documentation/video4linux/cx2341x/fw-decoder-api.txt +++ b/Documentation/video4linux/cx2341x/fw-decoder-api.txt
@@ -280,7 +280,7 @@ Description
280	Param[0]	280	Param[0]
281	Bitmask:	281	Bitmask:
282	0:1 Data size:	282	0:1 Data size:
283	'00' 16 bit	283	'00' 16 bit
284	'01' 20 bit	284	'01' 20 bit
285	'10' 24 bit	285	'10' 24 bit
286	2:7 Unused	286	2:7 Unused
@@ -292,9 +292,9 @@ Param[0]
292	(for left justified MSB first mode, 20 bit only)	292	(for left justified MSB first mode, 20 bit only)
293	10:11 Unused	293	10:11 Unused
294	12:13 Channel format:	294	12:13 Channel format:
295	'00' right justified MSB first mode	295	'00' right justified MSB first mode
296	'01' left justified MSB first mode	296	'01' left justified MSB first mode
297	'10' I2S mode	297	'10' I2S mode
298	14:15 Unused	298	14:15 Unused
299	16:21 Right justify bit count	299	16:21 Right justify bit count
300	22:31 Unused	300	22:31 Unused


diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt index 64cd111349ad..08ee9f5303f9 100644 --- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt +++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -281,64 +281,64 @@ Description
281	Param[0]	281	Param[0]
282	Bitmask:	282	Bitmask:
283	0:1 '00' 44.1Khz	283	0:1 '00' 44.1Khz
284	'01' 48Khz	284	'01' 48Khz
285	'10' 32Khz	285	'10' 32Khz
286	'11' reserved	286	'11' reserved
287		287
288	2:3 '01'=Layer I	288	2:3 '01'=Layer I
289	'10'=Layer II	289	'10'=Layer II
290		290
291	4:7 Bitrate:	291	4:7 Bitrate:
292	Index \| Layer I \| Layer II	292	Index \| Layer I \| Layer II
293	------+-------------+------------	293	------+-------------+------------
294	'0000' \| free format \| free format	294	'0000' \| free format \| free format
295	'0001' \| 32 kbit/s \| 32 kbit/s	295	'0001' \| 32 kbit/s \| 32 kbit/s
296	'0010' \| 64 kbit/s \| 48 kbit/s	296	'0010' \| 64 kbit/s \| 48 kbit/s
297	'0011' \| 96 kbit/s \| 56 kbit/s	297	'0011' \| 96 kbit/s \| 56 kbit/s
298	'0100' \| 128 kbit/s \| 64 kbit/s	298	'0100' \| 128 kbit/s \| 64 kbit/s
299	'0101' \| 160 kbit/s \| 80 kbit/s	299	'0101' \| 160 kbit/s \| 80 kbit/s
300	'0110' \| 192 kbit/s \| 96 kbit/s	300	'0110' \| 192 kbit/s \| 96 kbit/s
301	'0111' \| 224 kbit/s \| 112 kbit/s	301	'0111' \| 224 kbit/s \| 112 kbit/s
302	'1000' \| 256 kbit/s \| 128 kbit/s	302	'1000' \| 256 kbit/s \| 128 kbit/s
303	'1001' \| 288 kbit/s \| 160 kbit/s	303	'1001' \| 288 kbit/s \| 160 kbit/s
304	'1010' \| 320 kbit/s \| 192 kbit/s	304	'1010' \| 320 kbit/s \| 192 kbit/s
305	'1011' \| 352 kbit/s \| 224 kbit/s	305	'1011' \| 352 kbit/s \| 224 kbit/s
306	'1100' \| 384 kbit/s \| 256 kbit/s	306	'1100' \| 384 kbit/s \| 256 kbit/s
307	'1101' \| 416 kbit/s \| 320 kbit/s	307	'1101' \| 416 kbit/s \| 320 kbit/s
308	'1110' \| 448 kbit/s \| 384 kbit/s	308	'1110' \| 448 kbit/s \| 384 kbit/s
309	Note: For Layer II, not all combinations of total bitrate	309	Note: For Layer II, not all combinations of total bitrate
310	and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2	310	and mode are allowed. See ISO11172-3 3-Annex B, Table 3-B.2
311		311
312	8:9 '00'=Stereo	312	8:9 '00'=Stereo
313	'01'=JointStereo	313	'01'=JointStereo
314	'10'=Dual	314	'10'=Dual
315	'11'=Mono	315	'11'=Mono
316		316
317	10:11 Mode Extension used in joint_stereo mode.	317	10:11 Mode Extension used in joint_stereo mode.
318	In Layer I and II they indicate which subbands are in	318	In Layer I and II they indicate which subbands are in
319	intensity_stereo. All other subbands are coded in stereo.	319	intensity_stereo. All other subbands are coded in stereo.
320	'00' subbands 4-31 in intensity_stereo, bound==4	320	'00' subbands 4-31 in intensity_stereo, bound==4
321	'01' subbands 8-31 in intensity_stereo, bound==8	321	'01' subbands 8-31 in intensity_stereo, bound==8
322	'10' subbands 12-31 in intensity_stereo, bound==12	322	'10' subbands 12-31 in intensity_stereo, bound==12
323	'11' subbands 16-31 in intensity_stereo, bound==16	323	'11' subbands 16-31 in intensity_stereo, bound==16
324		324
325	12:13 Emphasis:	325	12:13 Emphasis:
326	'00' None	326	'00' None
327	'01' 50/15uS	327	'01' 50/15uS
328	'10' reserved	328	'10' reserved
329	'11' CCITT J.17	329	'11' CCITT J.17
330		330
331	14 CRC:	331	14 CRC:
332	'0' off	332	'0' off
333	'1' on	333	'1' on
334		334
335	15 Copyright:	335	15 Copyright:
336	'0' off	336	'0' off
337	'1' on	337	'1' on
338		338
339	16 Generation:	339	16 Generation:
340	'0' copy	340	'0' copy
341	'1' original	341	'1' original
342		342
343	-------------------------------------------------------------------------------	343	-------------------------------------------------------------------------------
344		344


diff --git a/Documentation/video4linux/cx2341x/fw-memory.txt b/Documentation/video4linux/cx2341x/fw-memory.txt index 336d8208ef3b..ef0aad3f88fc 100644 --- a/Documentation/video4linux/cx2341x/fw-memory.txt +++ b/Documentation/video4linux/cx2341x/fw-memory.txt
@@ -60,7 +60,7 @@ DMA Registers 0x000-0xff:
60	if changed to 0xffffffff DMA write interrupts break.	60	if changed to 0xffffffff DMA write interrupts break.
61	0x50 - always 0xffffffff	61	0x50 - always 0xffffffff
62	0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are	62	0x54 - always 0xffffffff (0x4c, 0x50, 0x54 seem like interrupt masks, are
63	3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the	63	3 processors on chip, Java ones, VPU, SPU, APU, maybe these are the
64	interrupt masks???).	64	interrupt masks???).
65	0x60-0x7C - random values	65	0x60-0x7C - random values
66	0x80 - first write linked list reg, for Encoder Memory addr	66	0x80 - first write linked list reg, for Encoder Memory addr