summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/88pm800.c
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 09:41:12 +0200
commit2d3aa0569cc111b7567cb082c2f8ab32e2245e49 (patch)
tree92be0b9a5383702098f62d831738fa588a0c6065 /drivers/mfd/88pm800.c
parent3a3ece5415bd7a4bc7923906369525943332fc1a (diff)
downloadlinux-2d3aa0569cc111b7567cb082c2f8ab32e2245e49.tar.gz
linux-2d3aa0569cc111b7567cb082c2f8ab32e2245e49.tar.bz2
linux-2d3aa0569cc111b7567cb082c2f8ab32e2245e49.zip
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/88pm800.c')
-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[] = {
},
};
+static struct mfd_cell regulator_devs[] = {
+ {
+ .name = "88pm80x-regulator",
+ .id = -1,
+ },
+};
+
static const struct regmap_irq pm800_irqs[] = {
/* INT0 */
[PM800_IRQ_ONKEY] = {
@@ -339,6 +346,21 @@ static int device_rtc_init(struct pm80x_chip *chip,
return 0;
}
+static int device_regulator_init(struct pm80x_chip *chip,
+ struct pm80x_platform_data *pdata)
+{
+ int ret;
+
+ ret = mfd_add_devices(chip->dev, 0, &regulator_devs[0],
+ ARRAY_SIZE(regulator_devs), NULL, 0, NULL);
+ if (ret) {
+ dev_err(chip->dev, "Failed to add regulator subdev\n");
+ return ret;
+ }
+
+ return 0;
+}
+
static int device_irq_init_800(struct pm80x_chip *chip)
{
struct regmap *map = chip->regmap;
@@ -500,6 +522,12 @@ static int device_800_init(struct pm80x_chip *chip,
goto out;
}
+ ret = device_regulator_init(chip, pdata);
+ if (ret) {
+ dev_err(chip->dev, "Failed to add regulators subdev\n");
+ goto out;
+ }
+
return 0;
out_dev:
mfd_remove_devices(chip->dev);