Commit 43625063 authored by Bhargav Raviprakash's avatar Bhargav Raviprakash Committed by Lee Jones
Browse files

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: default avatarBhargav Raviprakash <bhargav.r@ltts.com>
Acked-by: default avatarJulien 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: default avatarLee Jones <lee@kernel.org>
parent 84ccfaee

drivers/mfd/tps6594-core.c

+10 −6
Original line number Diff line number Diff line
@@ -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)

{

drivers/mfd/tps6594-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

drivers/mfd/tps6594-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/mfd/tps6594.h

+3 −1
Original line number Diff line number Diff line
@@ -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 */