mfd: twl6040: Select i2c fast mode as default with regmap patch

All boards using twl6040 configures the i2c bus to 400KHz. While twl6040's
defaults to normal mode (100KHz). So far twl6040 has no problem with i2c
communication in this configuration it is safer to select fast i2c mode.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 03dbff3..cb37bb8 100644 (file)
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -87,8 +87,13 @@ static struct reg_default twl6040_defaults[] = {
 };
 
 static struct reg_default twl6040_patch[] = {
-       /* Select I2C bus access to dual access registers */
-       { TWL6040_REG_ACCCTL, 0x09 },
+       /*
+        * Select I2C bus access to dual access registers
+        * Interrupt register is cleared on read
+        * Select fast mode for i2c (400KHz)
+        */
+       { TWL6040_REG_ACCCTL,
+               TWL6040_I2CSEL | TWL6040_INTCLRMODE | TWL6040_I2CMODE(1) },
 };
 
 

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 81f639b..a69d16b 100644 (file)
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -157,6 +157,7 @@
 #define TWL6040_I2CSEL                 0x01
 #define TWL6040_RESETSPLIT             0x04
 #define TWL6040_INTCLRMODE             0x08
+#define TWL6040_I2CMODE(x)             ((x & 0x3) << 4)
 
 /* STATUS (0x2E) fields */