mfd: Add support for twl6041

The delta between twl6040 and twl6041 is small, the main difference is in
the number of GPOs (3 on twl6040, 1 on twl6041).

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/Documentation/devicetree/bindings/mfd/twl6040.txt b/Documentation/devicetree/bindings/mfd/twl6040.txt
index bc67c6f424aacc05ae894ecc7f684d7443d9ac95..c855240f3a0e0afec8fa3e6870f82dddde00ebcc 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/twl6040.txt
+++ b/Documentation/devicetree/bindings/mfd/twl6040.txt
@@ -6,7 +6,7 @@ They are connected ot the host processor via i2c for commands, McPDM for audio
 data and commands.
 
 Required properties:
-- compatible : Must be "ti,twl6040";
+- compatible : "ti,twl6040" for twl6040, "ti,twl6041" for twl6041
 - reg: must be 0x4b for i2c address
 - interrupts: twl6040 has one interrupt line connecteded to the main SoC
 - interrupt-parent: The parent interrupt controller

diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 5f620ae3b1f970c27c8fa1232e7b11ca63e0b776..b0fad0ffca560b0714a9574b42d4c87c89ea3e4d 100644 (file)
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -679,6 +679,7 @@ static int __devexit twl6040_remove(struct i2c_client *client)
 
 static const struct i2c_device_id twl6040_i2c_id[] = {
        { "twl6040", 0, },
+       { "twl6041", 0, },
        { },
 };
 MODULE_DEVICE_TABLE(i2c, twl6040_i2c_id);

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 00b330e578b1066be84c14f4544e59995e0ebd87..eaad49f7c130f0d148b0a7679bd4a6195194e422 100644 (file)
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -163,6 +163,7 @@
 #define TWL6040_REV_ES1_0              0x00
 #define TWL6040_REV_ES1_1              0x01 /* Rev ES1.1 and ES1.2 */
 #define TWL6040_REV_ES1_3              0x02
+#define TWL6041_REV_ES2_0              0x10
 
 #define TWL6040_IRQ_TH                 0
 #define TWL6040_IRQ_PLUG               1