aboutsummaryrefslogtreecommitdiff
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2006-06-12 21:40:53 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-22 11:10:34 -0700
commit1ded969fb97fba33e7310ef95f0b3e3123d4d92a (patch)
tree660ed1ca5eee779d8e03aae97324d318b2a1fa45 /drivers/i2c/busses
parentb7c066044f4355d9fbe1ac45e03303b78d21e8d4 (diff)
[PATCH] i2c-ocores: Minor cleanups
Minor cleanup to the i2c-ocores driver. Peter Korsgaard will maintain the i2c-ocores driver. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-ocores.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index d5c0610bfe6..592824087c4 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -38,8 +38,8 @@ struct ocores_i2c {
#define OCI2C_PREHIGH 1
#define OCI2C_CONTROL 2
#define OCI2C_DATA 3
-#define OCI2C_CMD 4
-#define OCI2C_STATUS 4
+#define OCI2C_CMD 4 /* write only */
+#define OCI2C_STATUS 4 /* read only, same address as OCI2C_CMD */
#define OCI2C_CTRL_IEN 0x40
#define OCI2C_CTRL_EN 0x80
@@ -209,8 +209,6 @@ static struct i2c_adapter ocores_adapter = {
.name = "i2c-ocores",
.class = I2C_CLASS_HWMON,
.algo = &ocores_algorithm,
- .timeout = 2,
- .retries = 1,
};