diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:44:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:44:43 -0400 |
| commit | ceadda057c000fa82e6bbe508923d8181414dea7 (patch) | |
| tree | c57eeb217dba5d74c3e46d483f10714f5ac7c518 | |
| parent | 95619be590638bd48469ac81c0f6236f349f5640 (diff) | |
| parent | fbae3fb1546e199ab0cd185348f8124411a1ca9d (diff) | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Remove all i2c_set_clientdata(client, NULL) in drivers
i2c/busses: Move two drivers to embedded section
i2c: Rename i2c_check_addr to i2c_check_addr_busy
i2c: Document reserved I2C addresses
i2c: Check for address validity on client registration
i2c: Share the I2C device presence detection code
Documentation/i2c: Checkpatch cleanup
85 files changed, 191 insertions, 287 deletions
diff --git a/Documentation/i2c/busses/i2c-ali1535 b/Documentation/i2c/busses/i2c-ali1535 index 0db3b4c74ad1..acbc65a08097 100644 --- a/Documentation/i2c/busses/i2c-ali1535 +++ b/Documentation/i2c/busses/i2c-ali1535 | |||
| @@ -6,12 +6,12 @@ Supported adapters: | |||
| 6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/eng/support/datasheet_request.php |
| 7 | 7 | ||
| 8 | Authors: | 8 | Authors: |
| 9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
| 10 | Philip Edelbrock <phil@netroedge.com>, | 10 | Philip Edelbrock <phil@netroedge.com>, |
| 11 | Mark D. Studebaker <mdsxyz123@yahoo.com>, | 11 | Mark D. Studebaker <mdsxyz123@yahoo.com>, |
| 12 | Dan Eaton <dan.eaton@rocketlogix.com>, | 12 | Dan Eaton <dan.eaton@rocketlogix.com>, |
| 13 | Stephen Rousset<stephen.rousset@rocketlogix.com> | 13 | Stephen Rousset<stephen.rousset@rocketlogix.com> |
| 14 | 14 | ||
| 15 | Description | 15 | Description |
| 16 | ----------- | 16 | ----------- |
| 17 | 17 | ||
diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/i2c/busses/i2c-ali1563 index 99ad4b9bcc32..54691698d2dd 100644 --- a/Documentation/i2c/busses/i2c-ali1563 +++ b/Documentation/i2c/busses/i2c-ali1563 | |||
| @@ -18,7 +18,7 @@ For an overview of these chips see http://www.acerlabs.com | |||
| 18 | The M1563 southbridge is deceptively similar to the M1533, with a few | 18 | The M1563 southbridge is deceptively similar to the M1533, with a few |
| 19 | notable exceptions. One of those happens to be the fact they upgraded the | 19 | notable exceptions. One of those happens to be the fact they upgraded the |
| 20 | i2c core to be SMBus 2.0 compliant, and happens to be almost identical to | 20 | i2c core to be SMBus 2.0 compliant, and happens to be almost identical to |
| 21 | the i2c controller found in the Intel 801 south bridges. | 21 | the i2c controller found in the Intel 801 south bridges. |
| 22 | 22 | ||
| 23 | Features | 23 | Features |
| 24 | -------- | 24 | -------- |
diff --git a/Documentation/i2c/busses/i2c-ali15x3 b/Documentation/i2c/busses/i2c-ali15x3 index ff28d381bebe..600da90b8f12 100644 --- a/Documentation/i2c/busses/i2c-ali15x3 +++ b/Documentation/i2c/busses/i2c-ali15x3 | |||
| @@ -6,8 +6,8 @@ Supported adapters: | |||
| 6 | http://www.ali.com.tw/eng/support/datasheet_request.php | 6 | http://www.ali.com.tw/eng/support/datasheet_request.php |
| 7 | 7 | ||
| 8 | Authors: | 8 | Authors: |
| 9 | Frodo Looijaard <frodol@dds.nl>, | 9 | Frodo Looijaard <frodol@dds.nl>, |
| 10 | Philip Edelbrock <phil@netroedge.com>, | 10 | Philip Edelbrock <phil@netroedge.com>, |
| 11 | Mark D. Studebaker <mdsxyz123@yahoo.com> | 11 | Mark D. Studebaker <mdsxyz123@yahoo.com> |
| 12 | 12 | ||
| 13 | Module Parameters | 13 | Module Parameters |
| @@ -40,10 +40,10 @@ M1541 and M1543C South Bridges. | |||
| 40 | The M1543C is a South bridge for desktop systems. | 40 | The M1543C is a South bridge for desktop systems. |
| 41 | The M1541 is a South bridge for portable systems. | 41 | The M1541 is a South bridge for portable systems. |
| 42 | They are part of the following ALI chipsets: | 42 | They are part of the following ALI chipsets: |
| 43 | 43 | ||
| 44 | * "Aladdin Pro 2" includes the M1621 Slot 1 North bridge with AGP and | 44 | * "Aladdin Pro 2" includes the M1621 Slot 1 North bridge with AGP and |
| 45 | 100MHz CPU Front Side bus | 45 | 100MHz CPU Front Side bus |
| 46 | * "Aladdin V" includes the M1541 Socket 7 North bridge with AGP and 100MHz | 46 | * "Aladdin V" includes the M1541 Socket 7 North bridge with AGP and 100MHz |
| 47 | CPU Front Side bus | 47 | CPU Front Side bus |
| 48 | Some Aladdin V motherboards: | 48 | Some Aladdin V motherboards: |
| 49 | Asus P5A | 49 | Asus P5A |
| @@ -77,7 +77,7 @@ output of lspci will show something similar to the following: | |||
| 77 | ** then run lspci. | 77 | ** then run lspci. |
| 78 | ** If you see the 1533 and 5229 devices but NOT the 7101 device, | 78 | ** If you see the 1533 and 5229 devices but NOT the 7101 device, |
| 79 | ** th | ||