diff options
author | Lukasz Majewski <l.majewski@samsung.com> | 2010-09-27 08:32:24 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-28 18:30:09 -0400 |
commit | 509bd4764c110b89bb3d09a5b6621fd31dc58044 (patch) | |
tree | fe90cc3792c1e4a17d35301c3f0a62ef154a1787 /drivers/mfd | |
parent | 9d92492fb753f01caa31dc502f69c189c0c22ad0 (diff) |
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.c | 5 |
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, | |||
133 | max8998->dev = &i2c->dev; | 133 | max8998->dev = &i2c->dev; |
134 | max8998->i2c = i2c; | 134 | max8998->i2c = i2c; |
135 | max8998->irq = i2c->irq; | 135 | max8998->irq = i2c->irq; |
136 | max8998->type = id->driver_data; | ||
136 | if (pdata) { | 137 | if (pdata) { |
137 | max8998->ono = pdata->ono; | 138 | max8998->ono = pdata->ono; |
138 | max8998->irq_base = pdata->irq_base; | 139 | max8998->irq_base = pdata->irq_base; |
@@ -169,8 +170,8 @@ static int max8998_i2c_remove(struct i2c_client *i2c) | |||
169 | } | 170 | } |
170 | 171 | ||
171 | static const struct i2c_device_id max8998_i2c_id[] = { | 172 | static const struct i2c_device_id max8998_i2c_id[] = { |
172 | { "max8998", 0 }, | 173 | { "max8998", TYPE_MAX8998 }, |
173 | { "lp3974", 0 }, | 174 | { "lp3974", TYPE_LP3974}, |
174 | { } | 175 | { } |
175 | }; | 176 | }; |
176 | MODULE_DEVICE_TABLE(i2c, max8998_i2c_id); | 177 | MODULE_DEVICE_TABLE(i2c, max8998_i2c_id); |