mfd: tps65090: 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).

tps65090 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>

diff --git a/drivers/mfd/tps65090.c b/drivers/mfd/tps65090.c
index f88085ad9772ed8d4802f74383d2355bfceed7ca..d7ec318c40c30f519ed4c6a2608d061ec79d4e9d 100644 (file)
--- a/drivers/mfd/tps65090.c
+++ b/drivers/mfd/tps65090.c
@@ -30,7 +30,6 @@
 #include <linux/err.h>
 
 #define NUM_INT_REG 2
-#define TOTAL_NUM_REG 0x18
 
 #define TPS65090_INT1_MASK_VAC_STATUS_CHANGE           1
 #define TPS65090_INT1_MASK_VSYS_STATUS_CHANGE          2
@@ -161,8 +160,8 @@ static bool is_volatile_reg(struct device *dev, unsigned int reg)
 static const struct regmap_config tps65090_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
-       .max_register = TOTAL_NUM_REG,
-       .num_reg_defaults_raw = TOTAL_NUM_REG,
+       .max_register = TPS65090_MAX_REG,
+       .num_reg_defaults_raw = TPS65090_NUM_REGS,
        .cache_type = REGCACHE_RBTREE,
        .volatile_reg = is_volatile_reg,
 };

diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h
index 0bf2708df150d07862484b48c13204d799f81530..67d144b3b8f9d6b78db8c0f36f9b4e32e1e00659 100644 (file)
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -77,6 +77,11 @@ enum {
 #define TPS65090_REG_CG_CTRL5  0x09
 #define TPS65090_REG_CG_STATUS1        0x0a
 #define TPS65090_REG_CG_STATUS2        0x0b
+#define TPS65090_REG_AD_OUT1   0x17
+#define TPS65090_REG_AD_OUT2   0x18
+
+#define TPS65090_MAX_REG       TPS65090_REG_AD_OUT2
+#define TPS65090_NUM_REGS      (TPS65090_MAX_REG + 1)
 
 struct tps65090 {
        struct device           *dev;