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 | |
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')
27 files changed, 110 insertions, 105 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/DMA.txt b/Documentation/arm/Samsung-S3C24XX/DMA.txt index 37f4edcc5d87..3ed82383efea 100644 --- a/Documentation/arm/Samsung-S3C24XX/DMA.txt +++ b/Documentation/arm/Samsung-S3C24XX/DMA.txt | |||
@@ -5,7 +5,7 @@ Introduction | |||
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | The kernel provides an interface to manage DMA transfers | 7 | The kernel provides an interface to manage DMA transfers |
8 | using the DMA channels in the cpu, so that the central | 8 | using the DMA channels in the CPU, so that the central |
9 | duty of managing channel mappings, and programming the | 9 | duty of managing channel mappings, and programming the |
10 | channel generators is in one place. | 10 | channel generators is in one place. |
11 | 11 | ||
@@ -17,24 +17,24 @@ DMA Channel Ordering | |||
17 | channels to all sources, which means that some devices | 17 | channels to all sources, which means that some devices |
18 | have a restricted number of channels that can be used. | 18 | have a restricted number of channels that can be used. |
19 | 19 | ||
20 | To allow flexibilty for each cpu type and board, the | 20 | To allow flexibility for each CPU type and board, the |
21 | dma code can be given an dma ordering structure which | 21 | DMA code can be given a DMA ordering structure which |
22 | allows the order of channel search to be specified, as | 22 | allows the order of channel search to be specified, as |
23 | well as allowing the prohibition of certain claims. | 23 | well as allowing the prohibition of certain claims. |
24 | 24 | ||
25 | struct s3c24xx_dma_order has a list of channels, and | 25 | struct s3c24xx_dma_order has a list of channels, and |
26 | each channel within has a slot for a list of dma | 26 | each channel within has a slot for a list of DMA |
27 | channel numbers. The slots are searched in order, for | 27 | channel numbers. The slots are searched in order for |
28 | the presence of a dma channel number with DMA_CH_VALID | 28 | the presence of a DMA channel number with DMA_CH_VALID |
29 | orred in. | 29 | or-ed in. |
30 | 30 | ||
31 | If the order has the flag DMA_CH_NEVER set, then after | 31 | If the order has the flag DMA_CH_NEVER set, then after |
32 | checking the channel list, the system will return no | 32 | checking the channel list, the system will return no |
33 | found channel, thus denying the request. | 33 | found channel, thus denying the request. |
34 | 34 | ||
35 | A board support file can call s3c24xx_dma_order_set() | 35 | A board support file can call s3c24xx_dma_order_set() |
36 | to register an complete ordering set. The routine will | 36 | to register a complete ordering set. The routine will |
37 | copy the data, so the original can be discared with | 37 | copy the data, so the original can be discarded with |
38 | __initdata. | 38 | __initdata. |
39 | 39 | ||
40 | 40 | ||
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 6c46730c631a..e6244cde26e9 100644 --- a/Documentation/devices.txt +++ b/Documentation/devices.txt | |||
@@ -2188,7 +2188,7 @@ Your cooperation is appreciated. | |||
2188 | 2188 | ||
2189 | 136-143 char Unix98 PTY slaves | 2189 | 136-143 char Unix98 PTY slaves |
2190 | 0 = /dev/pts/0 First Unix98 pseudo-TTY | 2190 | 0 = /dev/pts/0 First Unix98 pseudo-TTY |
2191 | 1 = /dev/pts/1 Second Unix98 pesudo-TTY | 2191 | 1 = /dev/pts/1 Second Unix98 pseudo-TTY |
2192 | ... | 2192 | ... |
2193 | 2193 | ||
2194 | These device nodes are automatically generated with | 2194 | These device nodes are automatically generated with |
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 8569072fa387..387b8a720f4a 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt | |||
@@ -32,7 +32,7 @@ braindamaged document, if it's finally working, well, it's working. | |||
32 | 32 | ||
33 | For one reason or another, low level drivers don't receive as much | 33 | For one reason or another, low level drivers don't receive as much |
34 | attention or testing as core code, and bugs on driver detach or | 34 | attention or testing as core code, and bugs on driver detach or |
35 | initilaization failure doesn't happen often enough to be noticeable. | 35 | initialization failure don't happen often enough to be noticeable. |
36 | Init failure path is worse because it's much less travelled while | 36 | Init failure path is worse because it's much less travelled while |
37 | needs to handle multiple entry points. | 37 | needs to handle multiple entry points. |
38 | 38 | ||
@@ -160,7 +160,7 @@ resources on failure. For example, | |||
160 | devres_release_group(dev, NULL); | 160 | devres_release_group(dev, NULL); |
161 | return err_code; | 161 | return err_code; |
162 | 162 | ||
163 | As resource acquision failure usually means probe failure, constructs | 163 | As resource acquisition failure usually means probe failure, constructs |
164 | like above are usually useful in midlayer driver (e.g. libata core | 164 | like above are usually useful in midlayer driver (e.g. libata core |
165 | layer) where interface function shouldn't have side effect on failure. | 165 | layer) where interface function shouldn't have side effect on failure. |
166 | For LLDs, just returning error code suffices in most cases. | 166 | For LLDs, just returning error code suffices in most cases. |
diff --git a/Documentation/fb/deferred_io.txt b/Documentation/fb/deferred_io.txt index 73cf9fb7cf60..63883a892120 100644 --- a/Documentation/fb/deferred_io.txt +++ b/Documentation/fb/deferred_io.txt | |||
@@ -3,7 +3,7 @@ Deferred IO | |||
3 | 3 | ||
4 | Deferred IO is a way to delay and repurpose IO. It uses host memory as a | 4 | Deferred IO is a way to delay and repurpose IO. It uses host memory as a |
5 | buffer and the MMU pagefault as a pretrigger for when to perform the device | 5 | buffer and the MMU pagefault as a pretrigger for when to perform the device |
6 | IO. The following example may be a useful explaination of how one such setup | 6 | IO. The following example may be a useful explanation of how one such setup |
7 | works: | 7 | works: |
8 | 8 | ||
9 | - userspace app like Xfbdev mmaps framebuffer | 9 | - userspace app like Xfbdev mmaps framebuffer |
@@ -28,7 +28,7 @@ a relatively more expensive operation. | |||
28 | 28 | ||
29 | For some types of nonvolatile high latency displays, the desired image is | 29 | For some types of nonvolatile high latency displays, the desired image is |
30 | the final image rather than the intermediate stages which is why it's okay | 30 | the final image rather than the intermediate stages which is why it's okay |
31 | to not update for each write that is occuring. | 31 | to not update for each write that is occurring. |
32 | 32 | ||
33 | It may be the case that this is useful in other scenarios as well. Paul Mundt | 33 | It may be the case that this is useful in other scenarios as well. Paul Mundt |
34 | has mentioned a case where it is beneficial to use the page count to decide | 34 | has mentioned a case where it is beneficial to use the page count to decide |
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt index d6fd6c6e4244..b90f537af35c 100644 --- a/Documentation/filesystems/9p.txt +++ b/Documentation/filesystems/9p.txt | |||
@@ -54,7 +54,7 @@ OPTIONS | |||
54 | aname=name aname specifies the file tree to access when the server is | 54 | aname=name aname specifies the file tree to access when the server is |
55 | offering several exported file systems. | 55 | offering several exported file systems. |
56 | 56 | ||
57 | cache=mode specifies a cacheing policy. By default, no caches are used. | 57 | cache=mode specifies a caching policy. By default, no caches are used. |
58 | loose = no attempts are made at consistency, | 58 | loose = no attempts are made at consistency, |
59 | intended for exclusive, read-only mounts | 59 | intended for exclusive, read-only mounts |
60 | 60 | ||
diff --git a/Documentation/ia64/err_inject.txt b/Documentation/ia64/err_inject.txt index 6449a7090dbb..223e4f0582d0 100644 --- a/Documentation/ia64/err_inject.txt +++ b/Documentation/ia64/err_inject.txt | |||
@@ -21,10 +21,10 @@ software test suits to do stressful testing on IPF. | |||
21 | 21 | ||
22 | Below is a sample application as part of the whole tool. The sample | 22 | Below is a sample application as part of the whole tool. The sample |
23 | can be used as a working test tool. Or it can be expanded to include | 23 | can be used as a working test tool. Or it can be expanded to include |
24 | more features. It also can be a integrated into a libary or other user | 24 | more features. It also can be a integrated into a library or other user |
25 | application to have more thorough test. | 25 | application to have more thorough test. |
26 | 26 | ||
27 | The sample application takes err.conf as error configuation input. Gcc | 27 | The sample application takes err.conf as error configuration input. GCC |
28 | compiles the code. After you install err_inject driver, you can run | 28 | compiles the code. After you install err_inject driver, you can run |
29 | this sample application to inject errors. | 29 | this sample application to inject errors. |
30 | 30 | ||
@@ -809,7 +809,7 @@ int err_inj() | |||
809 | } | 809 | } |
810 | 810 | ||
811 | /* Create semaphore: If one_lock, one semaphore for all processors. | 811 | /* Create semaphore: If one_lock, one semaphore for all processors. |
812 | Otherwise, one sempaphore for each processor. */ | 812 | Otherwise, one semaphore for each processor. */ |
813 | if (one_lock) { | 813 | if (one_lock) { |
814 | if (create_sem(0)) { | 814 | if (create_sem(0)) { |
815 | printf("Can not create semaphore...exit\n"); | 815 | printf("Can not create semaphore...exit\n"); |
diff --git a/Documentation/input/atarikbd.txt b/Documentation/input/atarikbd.txt index ab050621e20f..f3a3ba8847ba 100644 --- a/Documentation/input/atarikbd.txt +++ b/Documentation/input/atarikbd.txt | |||
@@ -170,7 +170,7 @@ major controller faults (ROM checksum and RAM test) and such things as stuck | |||
170 | keys. Any keys down at power-up are presumed to be stuck, and their BREAK | 170 | keys. Any keys down at power-up are presumed to be stuck, and their BREAK |
171 | (sic) code is returned (which without the preceding MAKE code is a flag for a | 171 | (sic) code is returned (which without the preceding MAKE code is a flag for a |
172 | keyboard error). If the controller self-test completes without error, the code | 172 | keyboard error). If the controller self-test completes without error, the code |
173 | 0xF0 is returned. (This code will be used to indicate the version/rlease of | 173 | 0xF0 is returned. (This code will be used to indicate the version/release of |
174 | the ikbd controller. The first release of the ikbd is version 0xF0, should | 174 | the ikbd controller. The first release of the ikbd is version 0xF0, should |
175 | there be a second release it will be 0xF1, and so on.) | 175 | there be a second release it will be 0xF1, and so on.) |
176 | The ikbd defaults to a mouse position reporting with threshold of 1 unit in | 176 | The ikbd defaults to a mouse position reporting with threshold of 1 unit in |
@@ -413,7 +413,7 @@ INTERROGATION MODE. | |||
413 | %nnnnmmmm ; where m is JOYSTICK1 state | 413 | %nnnnmmmm ; where m is JOYSTICK1 state |
414 | ; and n is JOYSTICK0 state | 414 | ; and n is JOYSTICK0 state |
415 | 415 | ||
416 | Sets the ikbd to do nothing but monitor the serial command lne, maintain the | 416 | Sets the ikbd to do nothing but monitor the serial command line, maintain the |
417 | time-of-day clock, and monitor the joystick. The rate sets the interval | 417 | time-of-day clock, and monitor the joystick. The rate sets the interval |
418 | between joystick samples. | 418 | between joystick samples. |
419 | N.B. The user should not set the rate higher than the serial communications | 419 | N.B. The user should not set the rate higher than the serial communications |
@@ -446,10 +446,10 @@ The sample interval should be as constant as possible. | |||
446 | ; until vertical cursor key is generated before RY | 446 | ; until vertical cursor key is generated before RY |
447 | ; has elapsed | 447 | ; has elapsed |
448 | VX ; length (in tenths of seconds) of joystick closure | 448 | VX ; length (in tenths of seconds) of joystick closure |
449 | ; until horizontal cursor keystokes are generated | 449 | ; until horizontal cursor keystrokes are generated |
450 | ; after RX has elapsed | 450 | ; after RX has elapsed |
451 | VY ; length (in tenths of seconds) of joystick closure | 451 | VY ; length (in tenths of seconds) of joystick closure |
452 | ; until vertical cursor keystokes are generated | 452 | ; until vertical cursor keystrokes are generated |
453 | ; after RY has elapsed | 453 | ; after RY has elapsed |
454 | 454 | ||
455 | In this mode, joystick 0 is scanned in a way that simulates cursor keystrokes. | 455 | In this mode, joystick 0 is scanned in a way that simulates cursor keystrokes. |
diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt index afed1ae093ed..3ac92413c874 100644 --- a/Documentation/input/iforce-protocol.txt +++ b/Documentation/input/iforce-protocol.txt | |||
@@ -7,7 +7,7 @@ This is not a reference. Comments and corrections are welcome. To contact me, | |||
7 | send an email to: johann.deneux@gmail.com | 7 | send an email to: johann.deneux@gmail.com |
8 | 8 | ||
9 | ** WARNING ** | 9 | ** WARNING ** |
10 | I may not be held responsible for any dammage or harm caused if you try to | 10 | I shall not be held responsible for any damage or harm caused if you try to |
11 | send data to your I-Force device based on what you read in this document. | 11 | send data to your I-Force device based on what you read in this document. |
12 | 12 | ||
13 | ** Preliminary Notes: | 13 | ** Preliminary Notes: |
@@ -151,13 +151,13 @@ OP= ff | |||
151 | Query command. Length varies according to the query type. | 151 | Query command. Length varies according to the query type. |
152 | The general format of this packet is: | 152 | The general format of this packet is: |
153 | ff 01 QUERY [INDEX] CHECKSUM | 153 | ff 01 QUERY [INDEX] CHECKSUM |
154 | reponses are of the same form: | 154 | responses are of the same form: |
155 | FF LEN QUERY VALUE_QUERIED CHECKSUM2 | 155 | FF LEN QUERY VALUE_QUERIED CHECKSUM2 |
156 | where LEN = 1 + length(VALUE_QUERIED) | 156 | where LEN = 1 + length(VALUE_QUERIED) |
157 | 157 | ||
158 | **** Query ram size **** | 158 | **** Query ram size **** |
159 | QUERY = 42 ('B'uffer size) | 159 | QUERY = 42 ('B'uffer size) |
160 | The device should reply with the same packet plus two additionnal bytes | 160 | The device should reply with the same packet plus two additional bytes |
161 | containing the size of the memory: | 161 | containing the size of the memory: |
162 | ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available. | 162 | ff 03 42 03 e8 CS would mean that the device has 1000 bytes of ram available. |
163 | 163 | ||
@@ -234,12 +234,16 @@ is the amount of memory apparently needed for every set of parameters: | |||
234 | 234 | ||
235 | ** Appendix: How to study the protocol ? ** | 235 | ** Appendix: How to study the protocol ? ** |
236 | 236 | ||
237 | 1. Generate effects using the force editor provided with the DirectX SDK, or use Immersion Studio (freely available at their web site in the developer section: www.immersion.com) | 237 | 1. Generate effects using the force editor provided with the DirectX SDK, or |
238 | 2. Start a soft spying RS232 or USB (depending on where you connected your joystick/wheel). I used ComPortSpy from fCoder (alpha version!) | 238 | use Immersion Studio (freely available at their web site in the developer section: |
239 | www.immersion.com) | ||
240 | 2. Start a soft spying RS232 or USB (depending on where you connected your | ||
241 | joystick/wheel). I used ComPortSpy from fCoder (alpha version!) | ||
239 | 3. Play the effect, and watch what happens on the spy screen. | 242 | 3. Play the effect, and watch what happens on the spy screen. |
240 | 243 | ||
241 | A few words about ComPortSpy: | 244 | A few words about ComPortSpy: |
242 | At first glance, this soft seems, hum, well... buggy. In fact, data appear with a few seconds latency. Personnaly, I restart it every time I play an effect. | 245 | At first glance, this software seems, hum, well... buggy. In fact, data appear with a |
246 | few seconds latency. Personally, I restart it every time I play an effect. | ||
243 | Remember it's free (as in free beer) and alpha! | 247 | Remember it's free (as in free beer) and alpha! |
244 | 248 | ||
245 | ** URLS ** | 249 | ** URLS ** |
diff --git a/Documentation/input/input-programming.txt b/Documentation/input/input-programming.txt index 4d932dc66098..47fc86830cd7 100644 --- a/Documentation/input/input-programming.txt +++ b/Documentation/input/input-programming.txt | |||
@@ -79,7 +79,7 @@ In the _init function, which is called either upon module load or when | |||
79 | booting the kernel, it grabs the required resources (it should also check | 79 | booting the kernel, it grabs the required resources (it should also check |
80 | for the presence of the device). | 80 | for the presence of the device). |
81 | 81 | ||
82 | Then it allocates a new input device structure with input_aloocate_device() | 82 | Then it allocates a new input device structure with input_allocate_device() |
83 | and sets up input bitfields. This way the device driver tells the other | 83 | and sets up input bitfields. This way the device driver tells the other |
84 | parts of the input systems what it is - what events can be generated or | 84 | parts of the input systems what it is - what events can be generated or |
85 | accepted by this input device. Our example device can only generate EV_KEY | 85 | accepted by this input device. Our example device can only generate EV_KEY |
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt index d9e3b199929b..5a4ef48224ae 100644 --- a/Documentation/kernel-docs.txt +++ b/Documentation/kernel-docs.txt | |||
@@ -76,9 +76,9 @@ | |||
76 | * Title: "Conceptual Architecture of the Linux Kernel" | 76 | * Title: "Conceptual Architecture of the Linux Kernel" |
77 | Author: Ivan T. Bowman. | 77 | Author: Ivan T. Bowman. |
78 | URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html | 78 | URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html |
79 | Keywords: conceptual software arquitecture, extracted design, | 79 | Keywords: conceptual software architecture, extracted design, |
80 | reverse engineering, system structure. | 80 | reverse engineering, system structure. |
81 | Description: Conceptual software arquitecture of the Linux kernel, | 81 | Description: Conceptual software architecture of the Linux kernel, |
82 | automatically extracted from the source code. Very detailed. Good | 82 | automatically extracted from the source code. Very detailed. Good |
83 | figures. Gives good overall kernel understanding. | 83 | figures. Gives good overall kernel understanding. |
84 | 84 | ||
diff --git a/Documentation/networking/bcm43xx.txt b/Documentation/networking/bcm43xx.txt index a136721499bf..d602c8d6ff3e 100644 --- a/Documentation/networking/bcm43xx.txt +++ b/Documentation/networking/bcm43xx.txt | |||
@@ -37,7 +37,7 @@ all, distributions. There is, however, additional software that is | |||
37 | required. The firmware used by the chip is the intellectual property | 37 | required. The firmware used by the chip is the intellectual property |
38 | of Broadcom and they have not given the bcm43xx team redistribution | 38 | of Broadcom and they have not given the bcm43xx team redistribution |
39 | rights to this firmware. Since we cannot legally redistribute | 39 | rights to this firmware. Since we cannot legally redistribute |
40 | the firwmare we cannot include it with the driver. Furthermore, it | 40 | the firmware we cannot include it with the driver. Furthermore, it |
41 | cannot be placed in the downloadable archives of any distributing | 41 | cannot be placed in the downloadable archives of any distributing |
42 | organization; therefore, the user is responsible for obtaining the | 42 | organization; therefore, the user is responsible for obtaining the |
43 | firmware and placing it in the appropriate location so that the driver | 43 | firmware and placing it in the appropriate location so that the driver |
diff --git a/Documentation/networking/rxrpc.txt b/Documentation/networking/rxrpc.txt index c36b64b0020f..c3669a3fb4af 100644 --- a/Documentation/networking/rxrpc.txt +++ b/Documentation/networking/rxrpc.txt | |||
@@ -689,7 +689,7 @@ such as the AFS filesystem. This permits such a utility to: | |||
689 | buffers manipulated directly. | 689 | buffers manipulated directly. |
690 | 690 | ||
691 | To use the RxRPC facility, a kernel utility must still open an AF_RXRPC socket, | 691 | To use the RxRPC facility, a kernel utility must still open an AF_RXRPC socket, |
692 | bind an addess as appropriate and listen if it's to be a server socket, but | 692 | bind an address as appropriate and listen if it's to be a server socket, but |
693 | then it passes this to the kernel interface functions. | 693 | then it passes this to the kernel interface functions. |
694 | 694 | ||
695 | The kernel interface functions are as follows: | 695 | The kernel interface functions are as follows: |
diff --git a/Documentation/networking/udplite.txt b/Documentation/networking/udplite.txt index 6be09ba24a36..b6409cab075c 100644 --- a/Documentation/networking/udplite.txt +++ b/Documentation/networking/udplite.txt | |||
@@ -12,7 +12,7 @@ | |||
12 | For in-depth information, you can consult: | 12 | For in-depth information, you can consult: |
13 | 13 | ||
14 | o The UDP-Lite Homepage: http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/ | 14 | o The UDP-Lite Homepage: http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/ |
15 | Fom here you can also download some example application source code. | 15 | From here you can also download some example application source code. |
16 | 16 | ||
17 | o The UDP-Lite HOWTO on | 17 | o The UDP-Lite HOWTO on |
18 | http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/UDP-Lite-HOWTO.txt | 18 | http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/UDP-Lite-HOWTO.txt |
@@ -223,7 +223,7 @@ | |||
223 | While it is important that such cases are dealt with correctly, they | 223 | While it is important that such cases are dealt with correctly, they |
224 | are (annoyingly) rare: UDP-Lite is designed for optimising multimedia | 224 | are (annoyingly) rare: UDP-Lite is designed for optimising multimedia |
225 | performance over wireless (or generally noisy) links and thus smaller | 225 | performance over wireless (or generally noisy) links and thus smaller |
226 | coverage lenghts are likely to be expected. | 226 | coverage lengths are likely to be expected. |
227 | 227 | ||
228 | 228 | ||
229 | V) UDP-LITE RUNTIME STATISTICS AND THEIR MEANING | 229 | V) UDP-LITE RUNTIME STATISTICS AND THEIR MEANING |
@@ -259,7 +259,7 @@ | |||
259 | VI) IPTABLES | 259 | VI) IPTABLES |
260 | 260 | ||
261 | There is packet match support for UDP-Lite as well as support for the LOG target. | 261 | There is packet match support for UDP-Lite as well as support for the LOG target. |
262 | If you copy and paste the following line into /etc/protcols, | 262 | If you copy and paste the following line into /etc/protocols, |
263 | 263 | ||
264 | udplite 136 UDP-Lite # UDP-Lite [RFC 3828] | 264 | udplite 136 UDP-Lite # UDP-Lite [RFC 3828] |
265 | 265 | ||
diff --git a/Documentation/power/swsusp-and-swap-files.txt b/Documentation/power/swsusp-and-swap-files.txt index 06f911a5f885..f281886de490 100644 --- a/Documentation/power/swsusp-and-swap-files.txt +++ b/Documentation/power/swsusp-and-swap-files.txt | |||
@@ -39,7 +39,7 @@ resume=<swap_file_partition> resume_offset=<swap_file_offset> | |||
39 | where <swap_file_partition> is the partition on which the swap file is located | 39 | where <swap_file_partition> is the partition on which the swap file is located |
40 | and <swap_file_offset> is the offset of the swap header determined by the | 40 | and <swap_file_offset> is the offset of the swap header determined by the |
41 | application in 2) (of course, this step may be carried out automatically | 41 | application in 2) (of course, this step may be carried out automatically |
42 | by the same application that determies the swap file's header offset using the | 42 | by the same application that determines the swap file's header offset using the |
43 | FIBMAP ioctl) | 43 | FIBMAP ioctl) |
44 | 44 | ||
45 | OR | 45 | OR |
diff --git a/Documentation/powerpc/eeh-pci-error-recovery.txt b/Documentation/powerpc/eeh-pci-error-recovery.txt index 4530d1bf0286..df7afe43d462 100644 --- a/Documentation/powerpc/eeh-pci-error-recovery.txt +++ b/Documentation/powerpc/eeh-pci-error-recovery.txt | |||
@@ -36,8 +36,8 @@ Causes of EEH Errors | |||
36 | EEH was originally designed to guard against hardware failure, such | 36 | EEH was originally designed to guard against hardware failure, such |
37 | as PCI cards dying from heat, humidity, dust, vibration and bad | 37 | as PCI cards dying from heat, humidity, dust, vibration and bad |
38 | electrical connections. The vast majority of EEH errors seen in | 38 | electrical connections. The vast majority of EEH errors seen in |
39 | "real life" are due to eithr poorly seated PCI cards, or, | 39 | "real life" are due to either poorly seated PCI cards, or, |
40 | unfortunately quite commonly, due device driver bugs, device firmware | 40 | unfortunately quite commonly, due to device driver bugs, device firmware |
41 | bugs, and sometimes PCI card hardware bugs. | 41 | bugs, and sometimes PCI card hardware bugs. |
42 | 42 | ||
43 | The most common software bug, is one that causes the device to | 43 | The most common software bug, is one that causes the device to |
diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt index e59fcbbe338c..5f7d536cb0c6 100644 --- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt +++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt | |||
@@ -17,12 +17,12 @@ passed by the boot loader to the kernel at boot time. The device tree | |||
17 | describes what devices are present on the board and how they are | 17 | describes what devices are present on the board and how they are |
18 | connected. The device tree can either be passed as a binary blob (as | 18 | connected. The device tree can either be passed as a binary blob (as |
19 | described in Documentation/powerpc/booting-without-of.txt), or passed | 19 | described in Documentation/powerpc/booting-without-of.txt), or passed |
20 | by Open Firmare (IEEE 1275) compatible firmware using an OF compatible | 20 | by Open Firmware (IEEE 1275) compatible firmware using an OF compatible |
21 | client interface API. | 21 | client interface API. |
22 | 22 | ||
23 | This document specifies the requirements on the device-tree for mpc5200 | 23 | This document specifies the requirements on the device-tree for mpc5200 |
24 | based boards. These requirements are above and beyond the details | 24 | based boards. These requirements are above and beyond the details |
25 | specified in either the OpenFirmware spec or booting-without-of.txt | 25 | specified in either the Open Firmware spec or booting-without-of.txt |
26 | 26 | ||
27 | All new mpc5200-based boards are expected to match this document. In | 27 | All new mpc5200-based boards are expected to match this document. In |
28 | cases where this document is not sufficient to support a new board port, | 28 | cases where this document is not sufficient to support a new board port, |
@@ -73,8 +73,8 @@ match on the compatible list; the 'most compatible' driver should be | |||
73 | selected. | 73 | selected. |
74 | 74 | ||
75 | The split between the MPC5200 and the MPC5200B leaves a bit of a | 75 | The split between the MPC5200 and the MPC5200B leaves a bit of a |
76 | connundrum. How should the compatible property be set up to provide | 76 | conundrum. How should the compatible property be set up to provide |
77 | maximum compatability information; but still acurately describe the | 77 | maximum compatibility information; but still accurately describe the |
78 | chip? For the MPC5200; the answer is easy. Most of the SoC devices | 78 | chip? For the MPC5200; the answer is easy. Most of the SoC devices |
79 | originally appeared on the MPC5200. Since they didn't exist anywhere | 79 | originally appeared on the MPC5200. Since they didn't exist anywhere |
80 | else; the 5200 compatible properties will contain only one item; | 80 | else; the 5200 compatible properties will contain only one item; |
@@ -84,7 +84,7 @@ The 5200B is almost the same as the 5200, but not quite. It fixes | |||
84 | silicon bugs and it adds a small number of enhancements. Most of the | 84 | silicon bugs and it adds a small number of enhancements. Most of the |
85 | devices either provide exactly the same interface as on the 5200. A few | 85 | devices either provide exactly the same interface as on the 5200. A few |
86 | devices have extra functions but still have a backwards compatible mode. | 86 | devices have extra functions but still have a backwards compatible mode. |
87 | To express this infomation as completely as possible, 5200B device trees | 87 | To express this information as completely as possible, 5200B device trees |
88 | should have two items in the compatible list; | 88 | should have two items in the compatible list; |
89 | "mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended | 89 | "mpc5200b-<device>\0mpc5200-<device>". It is *strongly* recommended |
90 | that 5200B device trees follow this convention (instead of only listing | 90 | that 5200B device trees follow this convention (instead of only listing |
@@ -199,7 +199,7 @@ ethernet@<addr> network mpc5200-fec MPC5200 ethernet device | |||
199 | ata@<addr> ata mpc5200-ata IDE ATA interface | 199 | ata@<addr> ata mpc5200-ata IDE ATA interface |
200 | i2c@<addr> i2c mpc5200-i2c I2C controller | 200 | i2c@<addr> i2c mpc5200-i2c I2C controller |
201 | usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller | 201 | usb@<addr> usb-ohci-be mpc5200-ohci,ohci-be USB controller |
202 | xlb@<addr> xlb mpc5200-xlb XLB arbritrator | 202 | xlb@<addr> xlb mpc5200-xlb XLB arbitrator |
203 | 203 | ||
204 | Important child node properties | 204 | Important child node properties |
205 | name type description | 205 | name type description |
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt index 6aa9a891f3d0..683ccae00ad4 100644 --- a/Documentation/scsi/aic79xx.txt +++ b/Documentation/scsi/aic79xx.txt | |||
@@ -120,7 +120,7 @@ The following information is available in this file: | |||
120 | list size to avoid SCSI malloc pool fragmentation. | 120 | list size to avoid SCSI malloc pool fragmentation. |
121 | - Cleanup channel display in our /proc output. | 121 | - Cleanup channel display in our /proc output. |
122 | - Workaround duplicate device entries in the mid-layer | 122 | - Workaround duplicate device entries in the mid-layer |
123 | devlice list during add-single-device. | 123 | device list during add-single-device. |
124 | 124 | ||
125 | 1.3.6 (March 28th, 2003) | 125 | 1.3.6 (March 28th, 2003) |
126 | - Correct a double free in the Domain Validation code. | 126 | - Correct a double free in the Domain Validation code. |
diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt index 5f34d2ba69b4..b7e238cbb5a7 100644 --- a/Documentation/scsi/aic7xxx.txt +++ b/Documentation/scsi/aic7xxx.txt | |||
@@ -159,7 +159,7 @@ The following information is available in this file: | |||
159 | - Add support for 2.5.X's scsi_report_device_reset(). | 159 | - Add support for 2.5.X's scsi_report_device_reset(). |
160 | 160 | ||
161 | 6.2.34 (May 5th, 2003) | 161 | 6.2.34 (May 5th, 2003) |
162 | - Fix locking regression instroduced in 6.2.29 that | 162 | - Fix locking regression introduced in 6.2.29 that |
163 | could cause a lock order reversal between the io_request_lock | 163 | could cause a lock order reversal between the io_request_lock |
164 | and our per-softc lock. This was only possible on RH9, | 164 | and our per-softc lock. This was only possible on RH9, |
165 | SuSE, and kernel.org 2.4.X kernels. | 165 | SuSE, and kernel.org 2.4.X kernels. |
@@ -264,7 +264,7 @@ The following information is available in this file: | |||
264 | Option: tag_info:{{value[,value...]}[,{value[,value...]}...]} | 264 | Option: tag_info:{{value[,value...]}[,{value[,value...]}...]} |
265 | Definition: Set the per-target tagged queue depth on a | 265 | Definition: Set the per-target tagged queue depth on a |
266 | per controller basis. Both controllers and targets | 266 | per controller basis. Both controllers and targets |
267 | may be ommitted indicating that they should retain | 267 | may be omitted indicating that they should retain |
268 | the default tag depth. | 268 | the default tag depth. |
269 | Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32} | 269 | Examples: tag_info:{{16,32,32,64,8,8,,32,32,32,32,32,32,32,32,32} |
270 | On Controller 0 | 270 | On Controller 0 |
@@ -290,7 +290,7 @@ The following information is available in this file: | |||
290 | ----------------------------------------------------------------- | 290 | ----------------------------------------------------------------- |
291 | Option: dv: {value[,value...]} | 291 | Option: dv: {value[,value...]} |
292 | Definition: Set Domain Validation Policy on a per-controller basis. | 292 | Definition: Set Domain Validation Policy on a per-controller basis. |
293 | Controllers may be ommitted indicating that | 293 | Controllers may be omitted indicating that |
294 | they should retain the default read streaming setting. | 294 | they should retain the default read streaming setting. |
295 | Example: dv:{-1,0,,1,1,0} | 295 | Example: dv:{-1,0,,1,1,0} |
296 | On Controller 0 leave DV at its default setting. | 296 | On Controller 0 leave DV at its default setting. |
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt index a08e225653d6..a810421f1fb3 100644 --- a/Documentation/scsi/ibmmca.txt +++ b/Documentation/scsi/ibmmca.txt | |||
@@ -21,7 +21,7 @@ | |||
21 | versions older than 4.0 do not work with kernels 2.4.0 or later! If you | 21 | versions older than 4.0 do not work with kernels 2.4.0 or later! If you |
22 | try to compile your kernel with the wrong driver source, the | 22 | try to compile your kernel with the wrong driver source, the |
23 | compilation is aborted and you get a corresponding error message. This is | 23 | compilation is aborted and you get a corresponding error message. This is |
24 | no bug in the driver. It prevents you from using the wrong sourcecode | 24 | no bug in the driver; it prevents you from using the wrong source code |
25 | with the wrong kernel version. | 25 | with the wrong kernel version. |
26 | 26 | ||
27 | Authors of this Driver | 27 | Authors of this Driver |
@@ -58,7 +58,7 @@ | |||
58 | 5 Users' Manual | 58 | 5 Users' Manual |
59 | 5.1 Commandline Parameters | 59 | 5.1 Commandline Parameters |
60 | 5.2 Troubleshooting | 60 | 5.2 Troubleshooting |
61 | 5.3 Bugreports | 61 | 5.3 Bug reports |
62 | 5.4 Support WWW-page | 62 | 5.4 Support WWW-page |
63 | 6 References | 63 | 6 References |
64 | 7 Credits to | 64 | 7 Credits to |
@@ -71,13 +71,13 @@ | |||
71 | 71 | ||
72 | 1 Abstract | 72 | 1 Abstract |
73 | ---------- | 73 | ---------- |
74 | This README-file describes the IBM SCSI-subsystem low level driver for | 74 | This README-file describes the IBM SCSI-subsystem low level driver for |
75 | Linux. The descriptions which were formerly kept in the source-code have | 75 | Linux. The descriptions which were formerly kept in the source code have |
76 | been taken out to this file to easify the codes' readability. The driver | 76 | been taken out of this file to simplify the codes readability. The driver |
77 | description has been updated, as most of the former description was already | 77 | description has been updated, as most of the former description was already |
78 | quite outdated. The history of the driver development is also kept inside | 78 | quite outdated. The history of the driver development is also kept inside |
79 | here. Multiple historical developments have been summarized to shorten the | 79 | here. Multiple historical developments have been summarized to shorten the |
80 | textsize a bit. At the end of this file you can find a small manual for | 80 | text size a bit. At the end of this file you can find a small manual for |
81 | this driver and hints to get it running on your machine. | 81 | this driver and hints to get it running on your machine. |
82 | 82 | ||
83 | 2 Driver Description | 83 | 2 Driver Description |
@@ -186,7 +186,7 @@ | |||
186 | between 0 and 7). The IBM SCSI-2 F/W adapter offers this on up to two | 186 | between 0 and 7). The IBM SCSI-2 F/W adapter offers this on up to two |
187 | busses and provides support for 30 logical devices at the same time, where | 187 | busses and provides support for 30 logical devices at the same time, where |
188 | in wide-addressing mode you can have 16 puns with 32 luns on each device. | 188 | in wide-addressing mode you can have 16 puns with 32 luns on each device. |
189 | This section dexribes you the handling of devices on non-F/W adapters. | 189 | This section describes the handling of devices on non-F/W adapters. |
190 | Just imagine, that you can have 16 * 32 = 512 devices on a F/W adapter | 190 | Just imagine, that you can have 16 * 32 = 512 devices on a F/W adapter |
191 | which means a lot of possible devices for such a small machine. | 191 | which means a lot of possible devices for such a small machine. |
192 | 192 | ||
@@ -209,10 +209,10 @@ | |||
209 | -------------------------------------------------------- | 209 | -------------------------------------------------------- |
210 | One consequence of information hiding is that the real (pun,lun) | 210 | One consequence of information hiding is that the real (pun,lun) |
211 | numbers are also hidden. The two possibilities to get around this problem | 211 | numbers are also hidden. The two possibilities to get around this problem |
212 | is to offer fake pun/lun combinations to the operating system or to | 212 | are to offer fake pun/lun combinations to the operating system or to |
213 | delete the whole mapping of the adapter and to reassign the ldns, using | 213 | delete the whole mapping of the adapter and to reassign the ldns, using |
214 | the immediate assign command of the SCSI-subsystem for probing through | 214 | the immediate assign command of the SCSI-subsystem for probing through |
215 | all possible pun/lun combinations. a ldn is a "logical device number" | 215 | all possible pun/lun combinations. An ldn is a "logical device number" |
216 | which is used by IBM SCSI-subsystems to access some valid SCSI-device. | 216 | which is used by IBM SCSI-subsystems to access some valid SCSI-device. |
217 | At the beginning of the development of this driver, the following approach | 217 | At the beginning of the development of this driver, the following approach |
218 | was used: | 218 | was used: |
@@ -251,9 +251,9 @@ | |||
251 | lun>0 or to non-existing devices, in order to satisfy the subsystem, if | 251 | lun>0 or to non-existing devices, in order to satisfy the subsystem, if |
252 | there are less than 15 SCSI-devices connected. In the case of more than 15 | 252 | there are less than 15 SCSI-devices connected. In the case of more than 15 |
253 | devices, the dynamical mapping goes active. If the get_scsi[][] reports a | 253 | devices, the dynamical mapping goes active. If the get_scsi[][] reports a |
254 | device to be existant, but it has no ldn assigned, it gets a ldn out of 7 | 254 | device to be existent, but it has no ldn assigned, it gets an ldn out of 7 |
255 | to 14. The numbers are assigned in cyclic order. Therefore it takes 8 | 255 | to 14. The numbers are assigned in cyclic order, therefore it takes 8 |
256 | dynamical reassignments on the SCSI-devices, until a certain device | 256 | dynamical reassignments on the SCSI-devices until a certain device |
257 | loses its ldn again. This assures that dynamical remapping is avoided | 257 | loses its ldn again. This assures that dynamical remapping is avoided |
258 | during intense I/O between up to 15 SCSI-devices (means pun,lun | 258 | during intense I/O between up to 15 SCSI-devices (means pun,lun |
259 | combinations). A further advantage of this method is that people who | 259 | combinations). A further advantage of this method is that people who |
@@ -551,7 +551,7 @@ | |||
551 | than devices are available, they are assigned to non existing pun,lun | 551 | than devices are available, they are assigned to non existing pun,lun |
552 | combinations to satisfy the adapter. With this, the dynamical mapping | 552 | combinations to satisfy the adapter. With this, the dynamical mapping |
553 | was possible to implement. (For further info see the text in the | 553 | was possible to implement. (For further info see the text in the |
554 | source-code and in the description below. Read the description | 554 | source code and in the description below. Read the description |
555 | below BEFORE installing this driver on your system!) | 555 | below BEFORE installing this driver on your system!) |
556 | 2) Changed the name IBMMCA_DRIVER_VERSION to IBMMCA_SCSI_DRIVER_VERSION. | 556 | 2) Changed the name IBMMCA_DRIVER_VERSION to IBMMCA_SCSI_DRIVER_VERSION. |
557 | 3) The LED-display shows on PS/2-95 no longer the ldn, but the SCSI-ID | 557 | 3) The LED-display shows on PS/2-95 no longer the ldn, but the SCSI-ID |
@@ -762,9 +762,9 @@ | |||
762 | - Michael Lang | 762 | - Michael Lang |
763 | 763 | ||
764 | Apr 23, 2000 (v3.2pre1) | 764 | Apr 23, 2000 (v3.2pre1) |
765 | 1) During a very long time, I collected a huge amount of bugreports from | 765 | 1) During a very long time, I collected a huge amount of bug reports from |
766 | various people, trying really quite different things on their SCSI- | 766 | various people, trying really quite different things on their SCSI- |
767 | PS/2s. Today, all these bugreports are taken into account and should be | 767 | PS/2s. Today, all these bug reports are taken into account and should be |
768 | mostly solved. The major topics were: | 768 | mostly solved. The major topics were: |
769 | - Driver crashes during boottime by no obvious reason. | 769 | - Driver crashes during boottime by no obvious reason. |
770 | - Driver panics while the midlevel-SCSI-driver is trying to inquire | 770 | - Driver panics while the midlevel-SCSI-driver is trying to inquire |
@@ -819,7 +819,7 @@ | |||
819 | - Michael Lang | 819 | - Michael Lang |
820 | 820 | ||
821 | July 17, 2000 (v3.2pre8) | 821 | July 17, 2000 (v3.2pre8) |
822 | A long period of collecting bugreports from all corners of the world | 822 | A long period of collecting bug reports from all corners of the world |
823 | now lead to the following corrections to the code: | 823 | now lead to the following corrections to the code: |
824 | 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this | 824 | 1) SCSI-2 F/W support crashed with a COMMAND ERROR. The reason for this |
825 | was that it is possible to disable Fast-SCSI for the external bus. | 825 | was that it is possible to disable Fast-SCSI for the external bus. |
@@ -873,7 +873,7 @@ | |||
873 | July 26, 2000 (v3.2pre11) | 873 | July 26, 2000 (v3.2pre11) |
874 | 1) I passed a horrible weekend getting mad with NMIs on kernel 2.2.14 and | 874 | 1) I passed a horrible weekend getting mad with NMIs on kernel 2.2.14 and |
875 | a model 9595. Asking around in the community, nobody except of me has | 875 | a model 9595. Asking around in the community, nobody except of me has |
876 | seen such errors. Weired, but I am trying to recompile everything on | 876 | seen such errors. Weird, but I am trying to recompile everything on |
877 | the model 9595. Maybe, as I use a specially modified gcc, that could | 877 | the model 9595. Maybe, as I use a specially modified gcc, that could |
878 | cause problems. But, it was not the reason. The true background was, | 878 | cause problems. But, it was not the reason. The true background was, |
879 | that the kernel was compiled for i386 and the 9595 has a 486DX-2. | 879 | that the kernel was compiled for i386 and the 9595 has a 486DX-2. |
@@ -886,7 +886,7 @@ | |||
886 | alive rotator during boottime. This makes sense, when no monitor is | 886 | alive rotator during boottime. This makes sense, when no monitor is |
887 | connected to the system. You can get rid of all display activity, if | 887 | connected to the system. You can get rid of all display activity, if |
888 | you do not use any parameter or just ibmmcascsi=activity, for the | 888 | you do not use any parameter or just ibmmcascsi=activity, for the |
889 | harddrive activity LED, existant on all PS/2, except models 8595-XXX. | 889 | harddrive activity LED, existent on all PS/2, except models 8595-XXX. |
890 | If no monitor is available, please use ibmmcascsi=display, which works | 890 | If no monitor is available, please use ibmmcascsi=display, which works |
891 | fine together with the linuxinfo utility for the LED-panel. | 891 | fine together with the linuxinfo utility for the LED-panel. |
892 | - Michael Lang | 892 | - Michael Lang |
@@ -1115,7 +1115,7 @@ | |||
1115 | If this really happens, do also send e-mail to the maintainer, as | 1115 | If this really happens, do also send e-mail to the maintainer, as |
1116 | forced detection should be never necessary. Forced detection is in | 1116 | forced detection should be never necessary. Forced detection is in |
1117 | principal some flaw of the driver adapter detection and goes into | 1117 | principal some flaw of the driver adapter detection and goes into |
1118 | bugreports. | 1118 | bug reports. |
1119 | Q: The driver screws up, if it starts to probe SCSI-devices, is there | 1119 | Q: The driver screws up, if it starts to probe SCSI-devices, is there |
1120 | some way out of it? | 1120 | some way out of it? |
1121 | A: Yes, that was some recognition problem of the correct SCSI-adapter | 1121 | A: Yes, that was some recognition problem of the correct SCSI-adapter |
@@ -1172,7 +1172,7 @@ | |||
1172 | recommended version is 3.2 or later. Here, the F/W support is in | 1172 | recommended version is 3.2 or later. Here, the F/W support is in |
1173 | a stable and reliable condition. Wide-addressing is in addition | 1173 | a stable and reliable condition. Wide-addressing is in addition |
1174 | supported. | 1174 | supported. |
1175 | Q: I get a Ooops message and something like "killing interrupt". | 1175 | Q: I get an Oops message and something like "killing interrupt". |
1176 | A: The reason for this is that the IBM SCSI-subsystem only sends a | 1176 | A: The reason for this is that the IBM SCSI-subsystem only sends a |
1177 | termination status back, if some error appeared. In former releases | 1177 | termination status back, if some error appeared. In former releases |
1178 | of the driver, it was not checked, if the termination status block | 1178 | of the driver, it was not checked, if the termination status block |
@@ -1213,21 +1213,21 @@ | |||
1213 | problem. Not yet tried, but guessing that it could work. To get this, | 1213 | problem. Not yet tried, but guessing that it could work. To get this, |
1214 | set unchecked_isa_dma argument of ibmmca.h from 0 to 1. | 1214 | set unchecked_isa_dma argument of ibmmca.h from 0 to 1. |
1215 | 1215 | ||
1216 | 5.3 Bugreports | 1216 | 5.3 Bug reports |
1217 | -------------- | 1217 | -------------- |
1218 | If you really find bugs in the sourcecode or the driver will successfully | 1218 | If you really find bugs in the source code or the driver will successfully |
1219 | refuse to work on your machine, you should send a bug report to me. The | 1219 | refuse to work on your machine, you should send a bug report to me. The |
1220 | best for this is to follow the instructions on the WWW-page for this | 1220 | best for this is to follow the instructions on the WWW-page for this |
1221 | driver. Fill out the bug-report form, placed on the WWW-page and ship it, | 1221 | driver. Fill out the bug-report form, placed on the WWW-page and ship it, |
1222 | so the bugs can be taken into account with maximum efforts. But, please | 1222 | so the bugs can be taken into account with maximum efforts. But, please |
1223 | do not send bug reports about this driver to Linus Torvalds or Leonard | 1223 | do not send bug reports about this driver to Linus Torvalds or Leonard |
1224 | Zubkoff, as Linus is burried in E-Mail and Leonard is supervising all | 1224 | Zubkoff, as Linus is buried in E-Mail and Leonard is supervising all |
1225 | SCSI-drivers and won't have the time left to look inside every single | 1225 | SCSI-drivers and won't have the time left to look inside every single |
1226 | driver to fix a bug and especially DO NOT send modified code to Linus | 1226 | driver to fix a bug and especially DO NOT send modified code to Linus |
1227 | Torvalds or Alan J. Cox which has not been checked here!!! They are both | 1227 | Torvalds or Alan J. Cox which has not been checked here!!! They are both |
1228 | quite burried in E-mail (as me, sometimes, too) and one should first check | 1228 | quite buried in E-mail (as me, sometimes, too) and one should first check |
1229 | for problems on my local teststand. Recently, I got a lot of | 1229 | for problems on my local teststand. Recently, I got a lot of |
1230 | bugreports for errors in the ibmmca.c code, which I could not imagine, but | 1230 | bug reports for errors in the ibmmca.c code, which I could not imagine, but |
1231 | a look inside some Linux-distribution showed me quite often some modified | 1231 | a look inside some Linux-distribution showed me quite often some modified |
1232 | code, which did no longer work on most other machines than the one of the | 1232 | code, which did no longer work on most other machines than the one of the |
1233 | modifier. Ok, so now that there is maintenance service available for this | 1233 | modifier. Ok, so now that there is maintenance service available for this |
@@ -1261,7 +1261,7 @@ | |||
1261 | some e-mail directly, but at least with the same information as required by | 1261 | some e-mail directly, but at least with the same information as required by |
1262 | the formular. | 1262 | the formular. |
1263 | 1263 | ||
1264 | If you have extensive bugreports, including Ooops messages and | 1264 | If you have extensive bug reports, including Oops messages and |
1265 | screen-shots, please feel free to send it directly to the address | 1265 | screen-shots, please feel free to send it directly to the address |
1266 | of the maintainer, too. The current address of the maintainer is: | 1266 | of the maintainer, too. The current address of the maintainer is: |
1267 | 1267 | ||
@@ -1318,7 +1318,7 @@ | |||
1318 | detailed bug reports and ideas for this driver (and his | 1318 | detailed bug reports and ideas for this driver (and his |
1319 | patience ;-)). | 1319 | patience ;-)). |
1320 | Alan J. Cox | 1320 | Alan J. Cox |
1321 | for his bugreports and his bold activities in cross-checking | 1321 | for his bug reports and his bold activities in cross-checking |
1322 | the driver-code with his teststand. | 1322 | the driver-code with his teststand. |
1323 | 1323 | ||
1324 | 7.2 Sponsors & Supporters | 1324 | 7.2 Sponsors & Supporters |
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:- |
diff --git a/Documentation/sound/alsa/soc/clocking.txt b/Documentation/sound/alsa/soc/clocking.txt index e93960d53a1e..14930887c25f 100644 --- a/Documentation/sound/alsa/soc/clocking.txt +++ b/Documentation/sound/alsa/soc/clocking.txt | |||
@@ -2,20 +2,20 @@ Audio Clocking | |||
2 | ============== | 2 | ============== |
3 | 3 | ||
4 | This text describes the audio clocking terms in ASoC and digital audio in | 4 | This text describes the audio clocking terms in ASoC and digital audio in |
5 | general. Note: Audio clocking can be complex ! | 5 | general. Note: Audio clocking can be complex! |
6 | 6 | ||
7 | 7 | ||
8 | Master Clock | 8 | Master Clock |
9 | ------------ | 9 | ------------ |
10 | 10 | ||
11 | Every audio subsystem is driven by a master clock (sometimes refered to as MCLK | 11 | Every audio subsystem is driven by a master clock (sometimes referred to as MCLK |
12 | or SYSCLK). This audio master clock can be derived from a number of sources | 12 | or SYSCLK). This audio master clock can be derived from a number of sources |
13 | (e.g. crystal, PLL, CPU clock) and is responsible for producing the correct | 13 | (e.g. crystal, PLL, CPU clock) and is responsible for producing the correct |
14 | audio playback and capture sample rates. | 14 | audio playback and capture sample rates. |
15 | 15 | ||
16 | Some master clocks (e.g. PLL's and CPU based clocks) are configuarble in that | 16 | Some master clocks (e.g. PLL's and CPU based clocks) are configurable in that |
17 | their speed can be altered by software (depending on the system use and to save | 17 | their speed can be altered by software (depending on the system use and to save |
18 | power). Other master clocks are fixed at at set frequency (i.e. crystals). | 18 | power). Other master clocks are fixed at a set frequency (i.e. crystals). |
19 | 19 | ||
20 | 20 | ||
21 | DAI Clocks | 21 | DAI Clocks |
@@ -44,7 +44,7 @@ This relationship depends on the codec or SoC CPU in particular. In general | |||
44 | it's best to configure BCLK to the lowest possible speed (depending on your | 44 | it's best to configure BCLK to the lowest possible speed (depending on your |
45 | rate, number of channels and wordsize) to save on power. | 45 | rate, number of channels and wordsize) to save on power. |
46 | 46 | ||
47 | It's also desireable to use the codec (if possible) to drive (or master) the | 47 | It's also desirable to use the codec (if possible) to drive (or master) the |
48 | audio clocks as it's usually gives more accurate sample rates than the CPU. | 48 | audio clocks as it's usually gives more accurate sample rates than the CPU. |
49 | 49 | ||
50 | 50 | ||
diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt index 48983c75aad9..1e766ad0ebd1 100644 --- a/Documentation/sound/alsa/soc/codec.txt +++ b/Documentation/sound/alsa/soc/codec.txt | |||
@@ -19,7 +19,7 @@ Optionally, codec drivers can also provide:- | |||
19 | 6) DAPM event handler. | 19 | 6) DAPM event handler. |
20 | 7) DAC Digital mute control. | 20 | 7) DAC Digital mute control. |
21 | 21 | ||
22 | It's probably best to use this guide in conjuction with the existing codec | 22 | It's probably best to use this guide in conjunction with the existing codec |
23 | driver code in sound/soc/codecs/ | 23 | driver code in sound/soc/codecs/ |
24 | 24 | ||
25 | ASoC Codec driver breakdown | 25 | ASoC Codec driver breakdown |
@@ -28,7 +28,7 @@ ASoC Codec driver breakdown | |||
28 | 1 - Codec DAI and PCM configuration | 28 | 1 - Codec DAI and PCM configuration |
29 | ----------------------------------- | 29 | ----------------------------------- |
30 | Each codec driver must have a struct snd_soc_codec_dai to define it's DAI and | 30 | Each codec driver must have a struct snd_soc_codec_dai to define it's DAI and |
31 | PCM's capablities and operations. This struct is exported so that it can be | 31 | PCM's capabilities and operations. This struct is exported so that it can be |
32 | registered with the core by your machine driver. | 32 | registered with the core by your machine driver. |
33 | 33 | ||
34 | e.g. | 34 | e.g. |
@@ -67,7 +67,7 @@ EXPORT_SYMBOL_GPL(wm8731_dai); | |||
67 | 67 | ||
68 | 2 - Codec control IO | 68 | 2 - Codec control IO |
69 | -------------------- | 69 | -------------------- |
70 | The codec can ususally be controlled via an I2C or SPI style interface (AC97 | 70 | The codec can usually be controlled via an I2C or SPI style interface (AC97 |
71 | combines control with data in the DAI). The codec drivers will have to provide | 71 | combines control with data in the DAI). The codec drivers will have to provide |
72 | functions to read and write the codec registers along with supplying a register | 72 | functions to read and write the codec registers along with supplying a register |
73 | cache:- | 73 | cache:- |
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt index c11877f5b4a1..ab0766fd7869 100644 --- a/Documentation/sound/alsa/soc/dapm.txt +++ b/Documentation/sound/alsa/soc/dapm.txt | |||
@@ -11,7 +11,7 @@ other PM systems. | |||
11 | 11 | ||
12 | DAPM is also completely transparent to all user space applications as all power | 12 | DAPM is also completely transparent to all user space applications as all power |
13 | switching is done within the ASoC core. No code changes or recompiling are | 13 | switching is done within the ASoC core. No code changes or recompiling are |
14 | required for user space applications. DAPM makes power switching descisions based | 14 | required for user space applications. DAPM makes power switching decisions based |
15 | upon any audio stream (capture/playback) activity and audio mixer settings | 15 | upon any audio stream (capture/playback) activity and audio mixer settings |
16 | within the device. | 16 | within the device. |
17 | 17 | ||
@@ -38,7 +38,7 @@ There are 4 power domains within DAPM | |||
38 | Enabled and disabled when stream playback/capture is started and | 38 | Enabled and disabled when stream playback/capture is started and |
39 | stopped respectively. e.g. aplay, arecord. | 39 | stopped respectively. e.g. aplay, arecord. |
40 | 40 | ||
41 | All DAPM power switching descisons are made automatically by consulting an audio | 41 | All DAPM power switching decisions are made automatically by consulting an audio |
42 | routing map of the whole machine. This map is specific to each machine and | 42 | routing map of the whole machine. This map is specific to each machine and |
43 | consists of the interconnections between every audio component (including | 43 | consists of the interconnections between every audio component (including |
44 | internal codec components). All audio components that effect power are called | 44 | internal codec components). All audio components that effect power are called |
diff --git a/Documentation/sound/alsa/soc/overview.txt b/Documentation/sound/alsa/soc/overview.txt index 753c5cc5984a..c47ce9530677 100644 --- a/Documentation/sound/alsa/soc/overview.txt +++ b/Documentation/sound/alsa/soc/overview.txt | |||
@@ -2,18 +2,19 @@ ALSA SoC Layer | |||
2 | ============== | 2 | ============== |
3 | 3 | ||
4 | The overall project goal of the ALSA System on Chip (ASoC) layer is to provide | 4 | The overall project goal of the ALSA System on Chip (ASoC) layer is to provide |
5 | better ALSA support for embedded system on chip procesors (e.g. pxa2xx, au1x00, | 5 | better ALSA support for embedded system-on-chip processors (e.g. pxa2xx, au1x00, |
6 | iMX, etc) and portable audio codecs. Currently there is some support in the | 6 | iMX, etc) and portable audio codecs. Currently there is some support in the |
7 | kernel for SoC audio, however it has some limitations:- | 7 | kernel for SoC audio, however it has some limitations:- |
8 | 8 | ||
9 | * Currently, codec drivers are often tightly coupled to the underlying SoC | 9 | * Currently, codec drivers are often tightly coupled to the underlying SoC |
10 | cpu. This is not ideal and leads to code duplication i.e. Linux now has 4 | 10 | CPU. This is not ideal and leads to code duplication i.e. Linux now has 4 |
11 | different wm8731 drivers for 4 different SoC platforms. | 11 | different wm8731 drivers for 4 different SoC platforms. |
12 | 12 | ||
13 | * There is no standard method to signal user initiated audio events. | 13 | * There is no standard method to signal user initiated audio events (e.g. |
14 | e.g. Headphone/Mic insertion, Headphone/Mic detection after an insertion | 14 | Headphone/Mic insertion, Headphone/Mic detection after an insertion |
15 | event. These are quite common events on portable devices and ofter require | 15 | event). These are quite common events on portable devices and often require |
16 | machine specific code to re route audio, enable amps etc after such an event. | 16 | machine specific code to re-route audio, enable amps, etc., after such an |
17 | event. | ||
17 | 18 | ||
18 | * Current drivers tend to power up the entire codec when playing | 19 | * Current drivers tend to power up the entire codec when playing |
19 | (or recording) audio. This is fine for a PC, but tends to waste a lot of | 20 | (or recording) audio. This is fine for a PC, but tends to waste a lot of |
@@ -44,7 +45,7 @@ features :- | |||
44 | signals the codec when to change power states. | 45 | signals the codec when to change power states. |
45 | 46 | ||
46 | * Machine specific controls: Allow machines to add controls to the sound card | 47 | * Machine specific controls: Allow machines to add controls to the sound card |
47 | e.g. volume control for speaker amp. | 48 | (e.g. volume control for speaker amp). |
48 | 49 | ||
49 | To achieve all this, ASoC basically splits an embedded audio system into 3 | 50 | To achieve all this, ASoC basically splits an embedded audio system into 3 |
50 | components :- | 51 | components :- |
@@ -57,7 +58,7 @@ components :- | |||
57 | interface drivers (e.g. I2S, AC97, PCM) for that platform. | 58 | interface drivers (e.g. I2S, AC97, PCM) for that platform. |
58 | 59 | ||
59 | * Machine driver: The machine driver handles any machine specific controls and | 60 | * Machine driver: The machine driver handles any machine specific controls and |
60 | audio events. i.e. turing on an amp at start of playback. | 61 | audio events (e.g. turning on an amp at start of playback). |
61 | 62 | ||
62 | 63 | ||
63 | Documentation | 64 | Documentation |
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt index e95b16d5a53b..d4678b4dc6c6 100644 --- a/Documentation/sound/alsa/soc/platform.txt +++ b/Documentation/sound/alsa/soc/platform.txt | |||
@@ -20,7 +20,7 @@ struct snd_soc_ops { | |||
20 | int (*trigger)(struct snd_pcm_substream *, int); | 20 | int (*trigger)(struct snd_pcm_substream *, int); |
21 | }; | 21 | }; |
22 | 22 | ||
23 | The platform driver exports it's DMA functionailty via struct snd_soc_platform:- | 23 | The platform driver exports its DMA functionality via struct snd_soc_platform:- |
24 | 24 | ||
25 | struct snd_soc_platform { | 25 | struct snd_soc_platform { |
26 | char *name; | 26 | char *name; |
diff --git a/Documentation/sound/alsa/soc/pops_clicks.txt b/Documentation/sound/alsa/soc/pops_clicks.txt index 2cf7ee5b3d74..3371bd9d7cfa 100644 --- a/Documentation/sound/alsa/soc/pops_clicks.txt +++ b/Documentation/sound/alsa/soc/pops_clicks.txt | |||
@@ -2,7 +2,7 @@ Audio Pops and Clicks | |||
2 | ===================== | 2 | ===================== |
3 | 3 | ||
4 | Pops and clicks are unwanted audio artifacts caused by the powering up and down | 4 | Pops and clicks are unwanted audio artifacts caused by the powering up and down |
5 | of components within the audio subsystem. This is noticable on PC's when an | 5 | of components within the audio subsystem. This is noticeable on PCs when an |
6 | audio module is either loaded or unloaded (at module load time the sound card is | 6 | audio module is either loaded or unloaded (at module load time the sound card is |
7 | powered up and causes a popping noise on the speakers). | 7 | powered up and causes a popping noise on the speakers). |
8 | 8 | ||
@@ -16,7 +16,7 @@ Minimising Playback Pops and Clicks | |||
16 | =================================== | 16 | =================================== |
17 | 17 | ||
18 | Playback pops in portable audio subsystems cannot be completely eliminated atm, | 18 | Playback pops in portable audio subsystems cannot be completely eliminated atm, |
19 | however future audio codec hardware will have better pop and click supression. | 19 | however future audio codec hardware will have better pop and click suppression. |
20 | Pops can be reduced within playback by powering the audio components in a | 20 | Pops can be reduced within playback by powering the audio components in a |
21 | specific order. This order is different for startup and shutdown and follows | 21 | specific order. This order is different for startup and shutdown and follows |
22 | some basic rules:- | 22 | some basic rules:- |
@@ -33,7 +33,7 @@ Minimising Capture Pops and Clicks | |||
33 | ================================== | 33 | ================================== |
34 | 34 | ||
35 | Capture artifacts are somewhat easier to get rid as we can delay activating the | 35 | Capture artifacts are somewhat easier to get rid as we can delay activating the |
36 | ADC until all the pops have occured. This follows similar power rules to | 36 | ADC until all the pops have occurred. This follows similar power rules to |
37 | playback in that components are powered in a sequence depending upon stream | 37 | playback in that components are powered in a sequence depending upon stream |
38 | startup or shutdown. | 38 | startup or shutdown. |
39 | 39 | ||
diff --git a/Documentation/thinkpad-acpi.txt b/Documentation/thinkpad-acpi.txt index 659dcb0d0afd..ec499265deca 100644 --- a/Documentation/thinkpad-acpi.txt +++ b/Documentation/thinkpad-acpi.txt | |||
@@ -1035,7 +1035,7 @@ enable it if necessary to avoid overheating. | |||
1035 | 1035 | ||
1036 | An enabled fan in level "auto" may stop spinning if the EC decides the | 1036 | An enabled fan in level "auto" may stop spinning if the EC decides the |
1037 | ThinkPad is cool enough and doesn't need the extra airflow. This is | 1037 | ThinkPad is cool enough and doesn't need the extra airflow. This is |
1038 | normal, and the EC will spin the fan up if the varios thermal readings | 1038 | normal, and the EC will spin the fan up if the various thermal readings |
1039 | rise too much. | 1039 | rise too much. |
1040 | 1040 | ||
1041 | On the X40, this seems to depend on the CPU and HDD temperatures. | 1041 | On the X40, this seems to depend on the CPU and HDD temperatures. |