From e8bb4a86fe6d5676a1a527a2d701cb2835680b62 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 13 Mar 2012 09:05:14 -0700 Subject: [PATCH] --- yaml --- r: 288490 b: refs/heads/master c: fecfb64422d91a9621a3f96ab75c3a5f13e80b58 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/hwmon/zl6100 | 14 ++++++-------- trunk/drivers/hwmon/pmbus/zl6100.c | 12 +++--------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 140d2d00084f..f430d161b879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43524b580e9599ef0d16adbbc4aa7ae808276ae +refs/heads/master: fecfb64422d91a9621a3f96ab75c3a5f13e80b58 diff --git a/trunk/Documentation/hwmon/zl6100 b/trunk/Documentation/hwmon/zl6100 index 51f76a189fee..a4e8d90f59f6 100644 --- a/trunk/Documentation/hwmon/zl6100 +++ b/trunk/Documentation/hwmon/zl6100 @@ -88,14 +88,12 @@ Module parameters delay ----- -Some Intersil/Zilker Labs DC-DC controllers require a minimum interval between -I2C bus accesses. According to Intersil, the minimum interval is 2 ms, though -1 ms appears to be sufficient and has not caused any problems in testing. -The problem is known to affect ZL6100, ZL2105, and ZL2008. It is known not to -affect ZL2004 and ZL6105. The driver automatically sets the interval to 1 ms -except for ZL2004 and ZL6105. To enable manual override, the driver provides a -writeable module parameter, 'delay', which can be used to set the interval to -a value between 0 and 65,535 microseconds. +Intersil/Zilker Labs DC-DC controllers require a minimum interval between I2C +bus accesses. According to Intersil, the minimum interval is 2 ms, though 1 ms +appears to be sufficient and has not caused any problems in testing. The problem +is known to affect all currently supported chips. For manual override, the +driver provides a writeable module parameter, 'delay', which can be used to set +the interval to a value between 0 and 65,535 microseconds. Sysfs entries diff --git a/trunk/drivers/hwmon/pmbus/zl6100.c b/trunk/drivers/hwmon/pmbus/zl6100.c index 880b90cf4d32..e3e8420b7b81 100644 --- a/trunk/drivers/hwmon/pmbus/zl6100.c +++ b/trunk/drivers/hwmon/pmbus/zl6100.c @@ -200,17 +200,11 @@ static int zl6100_probe(struct i2c_client *client, data->id = mid->driver_data; /* - * ZL2005, ZL2008, ZL2105, and ZL6100 are known to require a wait time - * between I2C accesses. ZL2004 and ZL6105 are known to be safe. - * Other chips have not yet been tested. - * - * Only clear the wait time for chips known to be safe. The wait time - * can be cleared later for additional chips if tests show that it - * is not needed (in other words, better be safe than sorry). + * According to information from the chip vendor, all currently + * supported chips are known to require a wait time between I2C + * accesses. */ data->delay = delay; - if (data->id == zl2004 || data->id == zl6105) - data->delay = 0; /* * Since there was a direct I2C device access above, wait before