summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLukasz Majewski <l.majewski@samsung.com>2010-09-27 16:32:24 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-29 02:30:09 +0400
commit509bd4764c110b89bb3d09a5b6621fd31dc58044 (patch)
treefe90cc3792c1e4a17d35301c3f0a62ef154a1787 /drivers/mfd
parent9d92492fb753f01caa31dc502f69c189c0c22ad0 (diff)
downloadlinux-509bd4764c110b89bb3d09a5b6621fd31dc58044.tar.xz
mfd: Support for ICs compliant with max8998
Signed-off-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max8998.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 310fd8054f35..a720f412cd15 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -133,6 +133,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
max8998->dev = &i2c->dev;
max8998->i2c = i2c;
max8998->irq = i2c->irq;
+ max8998->type = id->driver_data;
if (pdata) {
max8998->ono = pdata->ono;
max8998->irq_base = pdata->irq_base;
@@ -169,8 +170,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id max8998_i2c_id[] = {
- { "max8998", 0 },
- { "lp3974", 0 },
+ { "max8998", TYPE_MAX8998 },
+ { "lp3974", TYPE_LP3974},
{ }
};
MODULE_DEVICE_TABLE(i2c, max8998_i2c_id);