diff options
author | Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2016-01-31 16:58:41 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-03-16 04:50:34 -0400 |
commit | a862dc3ea793256a1364991f52e68198a2c5f27d (patch) | |
tree | 551c33f00299bc5ccee3e7fc4877d956e58528b5 | |
parent | 99f0fd540f53985443f36f96c0da209665e2dbfa (diff) |
mfd: rc5t583: 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).
rc5t583 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/rc5t583.c | 4 | ||||
-rw-r--r-- | include/linux/mfd/rc5t583.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c index e10f02f5d551..fc2b2d93f354 100644 --- a/drivers/mfd/rc5t583.c +++ b/drivers/mfd/rc5t583.c | |||
@@ -241,8 +241,8 @@ static const struct regmap_config rc5t583_regmap_config = { | |||
241 | .reg_bits = 8, | 241 | .reg_bits = 8, |
242 | .val_bits = 8, | 242 | .val_bits = 8, |
243 | .volatile_reg = volatile_reg, | 243 | .volatile_reg = volatile_reg, |
244 | .max_register = RC5T583_MAX_REGS, | 244 | .max_register = RC5T583_MAX_REG, |
245 | .num_reg_defaults_raw = RC5T583_MAX_REGS, | 245 | .num_reg_defaults_raw = RC5T583_NUM_REGS, |
246 | .cache_type = REGCACHE_RBTREE, | 246 | .cache_type = REGCACHE_RBTREE, |
247 | }; | 247 | }; |
248 | 248 | ||
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h index fd413ccab915..8d0a392e0a7f 100644 --- a/include/linux/mfd/rc5t583.h +++ b/include/linux/mfd/rc5t583.h | |||
@@ -28,8 +28,6 @@ | |||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/regmap.h> | 29 | #include <linux/regmap.h> |
30 | 30 | ||
31 | #define RC5T583_MAX_REGS 0xF8 | ||
32 | |||
33 | /* Maximum number of main interrupts */ | 31 | /* Maximum number of main interrupts */ |
34 | #define MAX_MAIN_INTERRUPT 5 | 32 | #define MAX_MAIN_INTERRUPT 5 |
35 | #define RC5T583_MAX_GPEDGE_REG 2 | 33 | #define RC5T583_MAX_GPEDGE_REG 2 |
@@ -169,6 +167,9 @@ | |||
169 | #define RC5T583_RTC_AY_MONTH 0xF3 | 167 | #define RC5T583_RTC_AY_MONTH 0xF3 |
170 | #define RC5T583_RTC_AY_YEAR 0xF4 | 168 | #define RC5T583_RTC_AY_YEAR 0xF4 |
171 | 169 | ||
170 | #define RC5T583_MAX_REG 0xF7 | ||
171 | #define RC5T583_NUM_REGS (RC5T583_MAX_REG + 1) | ||
172 | |||
172 | /* RICOH_RC5T583 IRQ definitions */ | 173 | /* RICOH_RC5T583 IRQ definitions */ |
173 | enum { | 174 | enum { |
174 | RC5T583_IRQ_ONKEY, | 175 | RC5T583_IRQ_ONKEY, |