mfd: tps6594: Use volatile_table instead of volatile_reg

In regmap_config use volatile_table instead of volatile_reg. This change
makes it easier to add support for TPS65224 PMIC.

Signed-off-by: Bhargav Raviprakash <bhargav.r@ltts.com>
Acked-by: Julien Panis <jpanis@baylibre.com>
Link: https://lore.kernel.org/r/0109018f2f267f6e-3121fa42-4816-45f7-a96d-0d6b4678da5a-000000@ap-south-1.amazonses.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/mfd/tps6594-core.c b/drivers/mfd/tps6594-core.c
index 783ee59901e86b988a9eed3d2bd78ce3494671e5..089ab8cc8664865f538b46db0f07455a10930909 100644 (file)
--- a/drivers/mfd/tps6594-core.c
+++ b/drivers/mfd/tps6594-core.c
@@ -319,12 +319,16 @@ static struct regmap_irq_chip tps6594_irq_chip = {
        .handle_post_irq = tps6594_handle_post_irq,
 };
 
-bool tps6594_is_volatile_reg(struct device *dev, unsigned int reg)
-{
-       return (reg >= TPS6594_REG_INT_TOP && reg <= TPS6594_REG_STAT_READBACK_ERR) ||
-              reg == TPS6594_REG_RTC_STATUS;
-}
-EXPORT_SYMBOL_GPL(tps6594_is_volatile_reg);
+static const struct regmap_range tps6594_volatile_ranges[] = {
+       regmap_reg_range(TPS6594_REG_INT_TOP, TPS6594_REG_STAT_READBACK_ERR),
+       regmap_reg_range(TPS6594_REG_RTC_STATUS, TPS6594_REG_RTC_STATUS),
+};
+
+const struct regmap_access_table tps6594_volatile_table = {
+       .yes_ranges = tps6594_volatile_ranges,
+       .n_yes_ranges = ARRAY_SIZE(tps6594_volatile_ranges),
+};
+EXPORT_SYMBOL_GPL(tps6594_volatile_table);
 
 static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)
 {

diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
index 899c88c0fe7744464796e7c0d67265a2628c2985..c125b474ba8af2c90d70c9adcd917a6ea181f0b5 100644 (file)
--- a/drivers/mfd/tps6594-i2c.c
+++ b/drivers/mfd/tps6594-i2c.c
@@ -187,7 +187,7 @@ static const struct regmap_config tps6594_i2c_regmap_config = {
        .reg_bits = 16,
        .val_bits = 8,
        .max_register = TPS6594_REG_DWD_FAIL_CNT_REG,
-       .volatile_reg = tps6594_is_volatile_reg,
+       .volatile_table = &tps6594_volatile_table,
        .read = tps6594_i2c_read,
        .write = tps6594_i2c_write,
 };

diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
index 24b72847e3f5a23b17b82fc8a31e35ec7b2c8175..5afb1736f0ae80543e9466749f0bf0a5ba1339d1 100644 (file)
--- a/drivers/mfd/tps6594-spi.c
+++ b/drivers/mfd/tps6594-spi.c
@@ -70,7 +70,7 @@ static const struct regmap_config tps6594_spi_regmap_config = {
        .reg_bits = 16,
        .val_bits = 8,
        .max_register = TPS6594_REG_DWD_FAIL_CNT_REG,
-       .volatile_reg = tps6594_is_volatile_reg,
+       .volatile_table = &tps6594_volatile_table,
        .reg_read = tps6594_spi_reg_read,
        .reg_write = tps6594_spi_reg_write,
        .use_single_read = true,

diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h
index e754c01acc64364ddaf9a1f788898c0af90486dc..16543fd4d83e2987f539f4719bfbd061f2c5dc8c 100644 (file)
--- a/include/linux/mfd/tps6594.h
+++ b/include/linux/mfd/tps6594.h
@@ -1337,7 +1337,9 @@ struct tps6594 {
        struct regmap_irq_chip_data *irq_data;
 };
 
-bool tps6594_is_volatile_reg(struct device *dev, unsigned int reg);
+extern const struct regmap_access_table tps6594_volatile_table;
+extern const struct regmap_access_table tps65224_volatile_table;
+
 int tps6594_device_init(struct tps6594 *tps, bool enable_crc);
 
 #endif /*  __LINUX_MFD_TPS6594_H */