summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAnilKumar Ch <anilkumar@ti.com>2012-09-07 20:45:05 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-08 08:54:15 +0800
commit52b84dac436a681fa51dad2b9e57b6ea50309cbd (patch)
treef7bfcf40abfde3305efbe4d02d4df6c3661ab759 /drivers/regulator
parent2b5a24a01df12fbfa3e702ad7efae27bcb852e33 (diff)
regulator: core: Try using the parent device for the default regmap
If the device doesn't have a regmap specified by the driver and we can't find one on the device itself try its parent, providing a useful defualt for many MFDs. [Rewrite commit message -- broonie] Signed-off-by: AnilKumar Ch <anilkumar@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index ed376d9f525..03fad815347 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -3202,8 +3202,10 @@ regulator_register(const struct regulator_desc *regulator_desc,
rdev->desc = regulator_desc;
if (config->regmap)
rdev->regmap = config->regmap;
- else
+ else if (dev_get_regmap(dev, NULL))
rdev->regmap = dev_get_regmap(dev, NULL);
+ else if (dev->parent)
+ rdev->regmap = dev_get_regmap(dev->parent, NULL);
INIT_LIST_HEAD(&rdev->consumer_list);
INIT_LIST_HEAD(&rdev->list);
BLOCKING_INIT_NOTIFIER_HEAD(&rdev->notifier);