* [BK PATCH] i2c driver fixes for 2.6.0-test2
@ 2003-08-02 5:29 Greg KH
[not found] ` <20030802095518.4c5630ef.khali@linux-fr.org>
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2003-08-02 5:29 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, sensors
Hi,
Here are some i2c driver fixes for 2.6.0-test2. They include a number
of minor i2c fixes and add a new i2c bus controller driver.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.5
thanks,
greg k-h
drivers/i2c/Kconfig | 8
drivers/i2c/busses/Kconfig | 17 +
drivers/i2c/busses/Makefile | 1
drivers/i2c/busses/i2c-ali1535.c | 20 -
drivers/i2c/busses/i2c-ali15x3.c | 15 -
drivers/i2c/busses/i2c-amd756.c | 28 --
drivers/i2c/busses/i2c-amd8111.c | 6
drivers/i2c/busses/i2c-i801.c | 28 --
drivers/i2c/busses/i2c-nforce2.c | 470 +++++++++++++++++++++++++++++++++++++--
drivers/i2c/busses/i2c-piix4.c | 20 -
drivers/i2c/busses/i2c-sis96x.c | 18 -
drivers/i2c/busses/i2c-viapro.c | 18 -
drivers/i2c/chips/via686a.c | 20 -
drivers/i2c/i2c-keywest.c | 90 +------
include/linux/i2c.h | 7
15 files changed, 529 insertions(+), 237 deletions(-)
-----
<nikkne:hotpop.com>:
o I2C: fix Kconfig info
<patrick:dreker.de>:
o I2C: add ncforce2 i2c bus driver
Benjamin Herrenschmidt:
o I2C: timer clean up for i2c-keywest.c
Daniele Bellucci:
o I2C: fixed a little memory leak in i2c-ali15x3.c
Greg Kroah-Hartman:
o I2C: remove devinitdata marking from i2c-nforce2.c as it's wrong
o I2C: consolidate the i2c delay functions
o I2C: minor cleanups to the i2c-nforce2 driver
Jan Dittmer:
o I2C: convert via686a temp_* to milli degree celsius
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BK PATCH] i2c driver fixes for 2.6.0-test2
[not found] ` <20030805034921.GB11605@earth.solarsys.private>
@ 2003-08-14 5:13 ` Mark M. Hoffman
2003-08-14 21:14 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Mark M. Hoffman @ 2003-08-14 5:13 UTC (permalink / raw)
To: Sensors, LKML; +Cc: Greg KH
This is a resend of a patch to the i2c-nforce2.c I2C bus driver.
The start of the relevant thread was here:
http://archives.andrew.net.au/lm-sensors/msg03820.html
[comment]
This patch restores a line that was wrongly removed. There are also some
trivial cleanups. It applies & compiles vs. 2.6.0-test3. It's untested
(no hardware here).
[/comment]
--- linux-2.6.0-test3/drivers/i2c/busses/i2c-nforce2.c.orig 2003-08-14 00:53:00.000000000 -0400
+++ linux-2.6.0-test3/drivers/i2c/busses/i2c-nforce2.c 2003-08-14 01:05:31.000000000 -0400
@@ -51,10 +51,6 @@
#ifndef PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS
#define PCI_DEVICE_ID_NVIDIA_NFORCE2_SMBUS 0x0064
#endif
-/* TODO: sync with lm-sensors */
-#ifndef I2C_HW_SMBUS_NFORCE2
-#define I2C_HW_SMBUS_NFORCE2 0x0c
-#endif
struct nforce2_smbus {
@@ -128,20 +124,10 @@
.name = "unset",
};
-
-#if 0
-/* Internally used pause function */
-static void nforce2_do_pause(unsigned int amount)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(amount);
-}
-#endif
-
/* Return -1 on error. See smbus.h for more information */
-static s32 nforce2_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
- char read_write, u8 command, int size,
- union i2c_smbus_data * data)
+static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
+ unsigned short flags, char read_write,
+ u8 command, int size, union i2c_smbus_data * data)
{
struct nforce2_smbus *smbus = adap->algo_data;
unsigned char protocol, pec, temp;
@@ -249,7 +235,7 @@
#if 0
do {
- nforce2_do_pause(1);
+ i2c_do_pause(1);
temp = inb_p(NVIDIA_SMB_STS);
} while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
#endif
@@ -332,13 +318,8 @@
smbus->base, smbus->base+smbus->size-1, name);
return -1;
}
-/*
- smbus->adapter.owner = THIS_MODULE;
- smbus->adapter.id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_NFORCE2;
- smbus->adapter.algo = &smbus_algorithm;
- smbus->adapter.algo_data = smbus;
-*/
smbus->adapter = nforce2_adapter;
+ smbus->adapter.algo_data = smbus;
smbus->adapter.dev.parent = &dev->dev;
snprintf(smbus->adapter.name, DEVICE_NAME_SIZE,
"SMBus nForce2 adapter at %04x", smbus->base);
--
Mark M. Hoffman
mhoffman@lightlink.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BK PATCH] i2c driver fixes for 2.6.0-test2
2003-08-14 5:13 ` Mark M. Hoffman
@ 2003-08-14 21:14 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2003-08-14 21:14 UTC (permalink / raw)
To: Sensors, LKML
On Thu, Aug 14, 2003 at 01:13:47AM -0400, Mark M. Hoffman wrote:
> This is a resend of a patch to the i2c-nforce2.c I2C bus driver.
> The start of the relevant thread was here:
> http://archives.andrew.net.au/lm-sensors/msg03820.html
>
> [comment]
> This patch restores a line that was wrongly removed. There are also some
> trivial cleanups. It applies & compiles vs. 2.6.0-test3. It's untested
> (no hardware here).
> [/comment]
Oops, sorry I forgot this one. I've now applied it and will send it on
later to Linus.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-08-14 21:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-08-02 5:29 [BK PATCH] i2c driver fixes for 2.6.0-test2 Greg KH
[not found] ` <20030802095518.4c5630ef.khali@linux-fr.org>
[not found] ` <20030802165638.GF11038@kroah.com>
[not found] ` <20030803052728.GC5202@earth.solarsys.private>
[not found] ` <20030804160630.GB3395@kroah.com>
[not found] ` <20030805034921.GB11605@earth.solarsys.private>
2003-08-14 5:13 ` Mark M. Hoffman
2003-08-14 21:14 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).