[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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e3a38eeccbfa83238d56672faa8b60f0d148656..f4cf0148c90169cb1e7b2ea7a1c3ecdc7e98bcb4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2063,6 +2063,12 @@ M:      adaplas@pol.net
 L:      linux-fbdev-devel@lists.sourceforge.net
 S:      Maintained
 
+OPENCORES I2C BUS DRIVER
+P:     Peter Korsgaard
+M:     jacmet@sunsite.dk
+L:     lm-sensors@lm-sensors.org
+S:     Maintained
+
 ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
 P:     Mark Fasheh
 M:     mark.fasheh@oracle.com

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index d5c0610bfe6d9f54a8a458fae38bee911bffe984..592824087c490d4c488fbf1b9841701fb18c9eb4 100644 (file)
--- 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,
 };