diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 20:08:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 20:08:41 -0400 |
| commit | 11f16971ceeb0f442e58f318b0cfde8eb35296bb (patch) | |
| tree | 857d0975f65dcc81f7e0fe8ceabad183cd97e763 /Documentation | |
| parent | bcdc084257352902103aca85c65ddbbba8f74732 (diff) | |
| parent | e97b81ddbb8b8c72b85330ac4a454a4513dcba8a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (78 commits)
commit e97b81ddbb8b8c72b85330ac4a454a4513dcba8a
Author: Mark M. Hoffman <mhoffman@lightlink.com>
Date: Thu Mar 23 16:50:25 2006 +0100
[PATCH] i2c-parport: Make type parameter mandatory
This patch forces the user to specify what type of adapter is present when
loading i2c-parport or i2c-parport-light. If none is specified, the driver
init simply fails - instead of assuming adapter type 0.
This alleviates the sometimes lengthy boot time delays which can be caused
by accidentally building one of these into a kernel along with several i2c
slave drivers that have lengthy probe routines (e.g. hwmon drivers).
Kconfig and documentation updated accordingly.
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/i2c/busses/i2c-parport | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Documentation/i2c/busses/i2c-parport b/Documentation/i2c/busses/i2c-parport index d9f23c0763f1..77b995dfca22 100644 --- a/Documentation/i2c/busses/i2c-parport +++ b/Documentation/i2c/busses/i2c-parport | |||
| @@ -12,18 +12,22 @@ meant as a replacement for the older, individual drivers: | |||
| 12 | teletext adapters) | 12 | teletext adapters) |
| 13 | 13 | ||
| 14 | It currently supports the following devices: | 14 | It currently supports the following devices: |
| 15 | * Philips adapter | 15 | * (type=0) Philips adapter |
| 16 | * home brew teletext adapter | 16 | * (type=1) home brew teletext adapter |
| 17 | * Velleman K8000 adapter | 17 | * (type=2) Velleman K8000 adapter |
| 18 | * ELV adapter | 18 | * (type=3) ELV adapter |
| 19 | * Analog Devices evaluation boards (ADM1025, ADM1030, ADM1031, ADM1032) | 19 | * (type=4) Analog Devices ADM1032 evaluation board |
| 20 | * Barco LPT->DVI (K5800236) adapter | 20 | * (type=5) Analog Devices evaluation boards: ADM1025, ADM1030, ADM1031 |
| 21 | * (type=6) Barco LPT->DVI (K5800236) adapter | ||
| 21 | 22 | ||
| 22 | These devices use different pinout configurations, so you have to tell | 23 | These devices use different pinout configurations, so you have to tell |
| 23 | the driver what you have, using the type module parameter. There is no | 24 | the driver what you have, using the type module parameter. There is no |
| 24 | way to autodetect the devices. Support for different pinout configurations | 25 | way to autodetect the devices. Support for different pinout configurations |
| 25 | can be easily added when needed. | 26 | can be easily added when needed. |
| 26 | 27 | ||
| 28 | Earlier kernels defaulted to type=0 (Philips). But now, if the type | ||
| 29 | parameter is missing, the driver will simply fail to initialize. | ||
| 30 | |||
| 27 | 31 | ||
| 28 | Building your own adapter | 32 | Building your own adapter |
| 29 | ------------------------- | 33 | ------------------------- |