aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2016-01-31 16:56:59 -0500
committerLee Jones <lee.jones@linaro.org>2016-03-16 04:50:34 -0400
commite9b7ba7954fa8df6e021ee4bef084ed10eba2c2b (patch)
tree0cc8eac43c8c27c0dee11a95ae74828e5d5f4be6
parenta862dc3ea793256a1364991f52e68198a2c5f27d (diff)
mfd: as3711: Set regmap config reg counts properly
Regmap config max_register field should contain number of device last register, however num_reg_defaults_raw field should be set to register count instead (usually one register more than max_register). as3711 driver had both of these fields set to the same value, fix this by introducing separate defines for max register number and total count of registers. Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/as3711.c4
-rw-r--r--include/linux/mfd/as3711.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mfd/as3711.c b/drivers/mfd/as3711.c
index 94d67a6e1eb7..09e1483b99bc 100644
--- a/drivers/mfd/as3711.c
+++ b/drivers/mfd/as3711.c
@@ -108,8 +108,8 @@ static const struct regmap_config as3711_regmap_config = {
108 .volatile_reg = as3711_volatile_reg, 108 .volatile_reg = as3711_volatile_reg,
109 .readable_reg = as3711_readable_reg, 109 .readable_reg = as3711_readable_reg,
110 .precious_reg = as3711_precious_reg, 110 .precious_reg = as3711_precious_reg,
111 .max_register = AS3711_MAX_REGS, 111 .max_register = AS3711_MAX_REG,
112 .num_reg_defaults_raw = AS3711_MAX_REGS, 112 .num_reg_defaults_raw = AS3711_NUM_REGS,
113 .cache_type = REGCACHE_RBTREE, 113 .cache_type = REGCACHE_RBTREE,
114}; 114};
115 115
diff --git a/include/linux/mfd/as3711.h b/include/linux/mfd/as3711.h
index 38452ce1e892..34cc85864be5 100644
--- a/include/linux/mfd/as3711.h
+++ b/include/linux/mfd/as3711.h
@@ -51,7 +51,8 @@
51#define AS3711_ASIC_ID_1 0x90 51#define AS3711_ASIC_ID_1 0x90
52#define AS3711_ASIC_ID_2 0x91 52#define AS3711_ASIC_ID_2 0x91
53 53
54#define AS3711_MAX_REGS 0x92 54#define AS3711_MAX_REG AS3711_ASIC_ID_2
55#define AS3711_NUM_REGS (AS3711_MAX_REG + 1)
55 56
56/* Regulators */ 57/* Regulators */
57enum { 58enum {