aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorChao Xie <chao.xie@marvell.com>2013-06-14 01:21:53 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-18 03:41:12 -0400
commit2d3aa0569cc111b7567cb082c2f8ab32e2245e49 (patch)
tree92be0b9a5383702098f62d831738fa588a0c6065 /drivers/mfd
parent3a3ece5415bd7a4bc7923906369525943332fc1a (diff)
mfd: 88pm800: Add regulator sub device
Signed-off-by: Chao Xie <chao.xie@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/88pm800.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
index a475fb3c2d0c..6c954835d61e 100644
--- a/drivers/mfd/88pm800.c
+++ b/drivers/mfd/88pm800.c
@@ -157,6 +157,13 @@ static struct mfd_cell onkey_devs[] = {
157 }, 157 },
158}; 158};
159 159
160static struct mfd_cell regulator_devs[] = {
161 {
162 .name = "88pm80x-regulator",
163 .id = -1,
164 },
165};
166
160static const struct regmap_irq pm800_irqs[] = { 167static const struct regmap_irq pm800_irqs[] = {
161 /* INT0 */ 168 /* INT0 */
162 [PM800_IRQ_ONKEY] = { 169 [PM800_IRQ_ONKEY] = {
@@ -339,6 +346,21 @@ static int device_rtc_init(struct pm80x_chip *chip,
339 return 0; 346 return 0;
340} 347}
341 348
349static int device_regulator_init(struct pm80x_chip *chip,
350 struct pm80x_platform_data *pdata)
351{
352 int ret;
353
354 ret = mfd_add_devices(chip->dev, 0, &regulator_devs[0],
355 ARRAY_SIZE(regulator_devs), NULL, 0, NULL);
356 if (ret) {
357 dev_err(chip->dev, "Failed to add regulator subdev\n");
358 return ret;
359 }
360
361 return 0;
362}
363
342static int device_irq_init_800(struct pm80x_chip *chip) 364static int device_irq_init_800(struct pm80x_chip *chip)
343{ 365{
344 struct regmap *map = chip->regmap; 366 struct regmap *map = chip->regmap;
@@ -500,6 +522,12 @@ static int device_800_init(struct pm80x_chip *chip,
500 goto out; 522 goto out;
501 } 523 }
502 524
525 ret = device_regulator_init(chip, pdata);
526 if (ret) {
527 dev_err(chip->dev, "Failed to add regulators subdev\n");
528 goto out;
529 }
530
503 return 0; 531 return 0;
504out_dev: 532out_dev:
505 mfd_remove_devices(chip->dev); 533 mfd_remove_devices(chip->dev);