Commit c42ba72e authored by Doug Anderson's avatar Doug Anderson Committed by Lee Jones
Browse files

mfd: tps65090: Stop caching most registers 



Nearly all of the registers in tps65090 combine control bits and
status bits.  Turn off caching of all registers except the select few
that can be cached.

In order to avoid adding more duplicate #defines, we also move some
register offset definitions to the mfd driver (and resolve
inconsistent names).

Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 7d811771

drivers/mfd/tps65090.c

+14 −13
Original line number Diff line number Diff line
@@ -32,14 +32,6 @@ 
#define NUM_INT_REG 2

#define TOTAL_NUM_REG 0x18



/* interrupt status registers */

#define TPS65090_INT_STS	0x0

#define TPS65090_INT_STS2	0x1



/* interrupt mask registers */

#define TPS65090_INT_MSK	0x2

#define TPS65090_INT_MSK2	0x3



#define TPS65090_INT1_MASK_VAC_STATUS_CHANGE		1

#define TPS65090_INT1_MASK_VSYS_STATUS_CHANGE		2

#define TPS65090_INT1_MASK_BAT_STATUS_CHANGE		3
@@ -144,18 +136,27 @@ static struct regmap_irq_chip tps65090_irq_chip = { 
	.irqs = tps65090_irqs,

	.num_irqs = ARRAY_SIZE(tps65090_irqs),

	.num_regs = NUM_INT_REG,

	.status_base = TPS65090_INT_STS,

	.mask_base = TPS65090_INT_MSK,

	.status_base = TPS65090_REG_INTR_STS,

	.mask_base = TPS65090_REG_INTR_MASK,

	.mask_invert = true,

};



static bool is_volatile_reg(struct device *dev, unsigned int reg)

{

	if ((reg == TPS65090_INT_STS) || (reg == TPS65090_INT_STS2))

		return true;

	else

	/* Nearly all registers have status bits mixed in, except a few */

	switch (reg) {

	case TPS65090_REG_INTR_MASK:

	case TPS65090_REG_INTR_MASK2:

	case TPS65090_REG_CG_CTRL0:

	case TPS65090_REG_CG_CTRL1:

	case TPS65090_REG_CG_CTRL2:

	case TPS65090_REG_CG_CTRL3:

	case TPS65090_REG_CG_CTRL4:

	case TPS65090_REG_CG_CTRL5:

		return false;

	}

	return true;

}



static const struct regmap_config tps65090_regmap_config = {

	.reg_bits = 8,

drivers/power/tps65090-charger.c

+0 −11
Original line number Diff line number Diff line
@@ -28,17 +28,6 @@ 


#include <linux/mfd/tps65090.h>



#define TPS65090_REG_INTR_STS	0x00

#define TPS65090_REG_INTR_MASK	0x02

#define TPS65090_REG_CG_CTRL0	0x04

#define TPS65090_REG_CG_CTRL1	0x05

#define TPS65090_REG_CG_CTRL2	0x06

#define TPS65090_REG_CG_CTRL3	0x07

#define TPS65090_REG_CG_CTRL4	0x08

#define TPS65090_REG_CG_CTRL5	0x09

#define TPS65090_REG_CG_STATUS1	0x0a

#define TPS65090_REG_CG_STATUS2	0x0b



#define TPS65090_CHARGER_ENABLE	BIT(0)

#define TPS65090_VACG		BIT(1)

#define TPS65090_NOITERM	BIT(5)

include/linux/mfd/tps65090.h

+14 −0
Original line number Diff line number Diff line
@@ -64,6 +64,20 @@ enum { 
	TPS65090_REGULATOR_MAX,

};



/* Register addresses */

#define TPS65090_REG_INTR_STS	0x00

#define TPS65090_REG_INTR_STS2	0x01

#define TPS65090_REG_INTR_MASK	0x02

#define TPS65090_REG_INTR_MASK2	0x03

#define TPS65090_REG_CG_CTRL0	0x04

#define TPS65090_REG_CG_CTRL1	0x05

#define TPS65090_REG_CG_CTRL2	0x06

#define TPS65090_REG_CG_CTRL3	0x07

#define TPS65090_REG_CG_CTRL4	0x08

#define TPS65090_REG_CG_CTRL5	0x09

#define TPS65090_REG_CG_STATUS1	0x0a

#define TPS65090_REG_CG_STATUS2	0x0b



struct tps65090 {

	struct device		*dev;

	struct regmap		*rmap;

CRA Git | Maintained and supported by SUSTech CRA and CCSE