From b42dfef7687c68a73bbcd81e4096a61401fc27a5 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 2 Mar 2010 12:23:40 +0100 Subject: [PATCH] --- yaml --- r: 185027 b: refs/heads/master c: c05d490234b7cf1715d9568d2041d9bc598a0b45 h: refs/heads/master i: 185025: 6c9464aa6c197d4e69d1172a090293ff4b9748fc 185023: dc5911eda39dec77a8f9ac7032ba7ec4814beab2 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-tiny-usb.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65aa667b085a..9337a862bbe6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 393764340beb595c1ad7dd2d2243c2b6551aaa71 +refs/heads/master: c05d490234b7cf1715d9568d2041d9bc598a0b45 diff --git a/trunk/drivers/i2c/busses/i2c-tiny-usb.c b/trunk/drivers/i2c/busses/i2c-tiny-usb.c index 41adb390e49c..b5b1bbf37d3c 100644 --- a/trunk/drivers/i2c/busses/i2c-tiny-usb.c +++ b/trunk/drivers/i2c/busses/i2c-tiny-usb.c @@ -31,11 +31,13 @@ #define CMD_I2C_IO_BEGIN (1<<0) #define CMD_I2C_IO_END (1<<1) -/* i2c bit delay, default is 10us -> 100kHz */ +/* i2c bit delay, default is 10us -> 100kHz max + (in practice, due to additional delays in the i2c bitbanging + code this results in a i2c clock of about 50kHz) */ static unsigned short delay = 10; module_param(delay, ushort, 0); -MODULE_PARM_DESC(delay, "bit delay in microseconds, " - "e.g. 10 for 100kHz (default is 100kHz)"); +MODULE_PARM_DESC(delay, "bit delay in microseconds " + "(default is 10us for 100kHz max)"); static int usb_read(struct i2c_adapter *adapter, int cmd, int value, int index, void *data, int len);