summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJorge Eduardo Candelaria <jedu@slimlogic.co.uk>2011-05-17 01:34:59 +0200
committerLiam Girdwood <lrg@slimlogic.co.uk>2011-05-27 11:49:10 +0200
commit795570561cc9c8dc7f7582ed6c4d07121b1c4831 (patch)
tree767ca7646c6d23a5b8b38347014afe3f178cbdef /drivers
parentregulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage (diff)
downloadlinux-795570561cc9c8dc7f7582ed6c4d07121b1c4831.tar.xz
linux-795570561cc9c8dc7f7582ed6c4d07121b1c4831.zip
MFD: TPS65910: Add support for TPS65911 device
The TPS65911 is the next generation of the TPS65910 family of PMIC chips. It adds a few features: - Watchdog Timer - PWM & LED generators - Comparators for system control status It also adds a set of Interrupts and GPIOs, among other things. The driver exports a function to identify between different versions of the tps65910 family, allowing other modules to identify the capabilities of the current chip. Signed-off-by: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/tps65910.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index e31824870b9f..2229e66d80db 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -157,6 +157,7 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, tps65910);
tps65910->dev = &i2c->dev;
tps65910->i2c_client = i2c;
+ tps65910->id = id->driver_data;
tps65910->read = tps65910_i2c_read;
tps65910->write = tps65910_i2c_write;
mutex_init(&tps65910->io_mutex);
@@ -192,7 +193,8 @@ static int tps65910_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id tps65910_i2c_id[] = {
- { "tps65910", 0 },
+ { "tps65910", TPS65910 },
+ { "tps65911", TPS65911 },
{ }
};
MODULE_DEVICE_TABLE(i2c, tps65910_i2c_id);