aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-05 19:01:34 +0100
committerMark Brown <broonie@linaro.org>2014-08-05 19:01:34 +0100
commitf955c8ba265540617da67d528ea74e50d48ad2be (patch)
tree50279d6dcedfaa0d735bef439944cea44c4ebf8a /drivers/base
parentMerge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next (diff)
parentMerge remote-tracking branch 'regmap/topic/getdev' into regmap-next (diff)
downloadlinux-dev-f955c8ba265540617da67d528ea74e50d48ad2be.tar.xz
linux-dev-f955c8ba265540617da67d528ea74e50d48ad2be.zip
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regulator-next
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 74d8c0672cf6..78f43fb2fe84 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1073,6 +1073,19 @@ struct regmap *dev_get_regmap(struct device *dev, const char *name)
}
EXPORT_SYMBOL_GPL(dev_get_regmap);
+/**
+ * regmap_get_device(): Obtain the device from a regmap
+ *
+ * @map: Register map to operate on.
+ *
+ * Returns the underlying device that the regmap has been created for.
+ */
+struct device *regmap_get_device(struct regmap *map)
+{
+ return map->dev;
+}
+EXPORT_SYMBOL_GPL(regmap_get_device);
+
static int _regmap_select_page(struct regmap *map, unsigned int *reg,
struct regmap_range_node *range,
unsigned int val_num)