aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-14 17:11:00 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-14 17:11:00 +0000
commit3bef9059dd8d50c011ea22ae60eaa03996bd4ad1 (patch)
treecc537871e8c004f794d1648b24de7e923109ab72 /drivers/base
parent836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff)
parent237019e7e356abb1bad591fa5edab68224793143 (diff)
Merge remote-tracking branch 'regmap/topic/24bit' into regmap-next
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/regmap/regmap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index f00b059c057..dc19026d28e 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -500,6 +500,12 @@ struct regmap *regmap_init(struct device *dev,
}
break;
+ case 24:
+ if (reg_endian != REGMAP_ENDIAN_BIG)
+ goto err_map;
+ map->format.format_reg = regmap_format_24;
+ break;
+
case 32:
switch (reg_endian) {
case REGMAP_ENDIAN_BIG: