Commit dc9913a0 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Samuel Ortiz
Browse files

mfd: Use regmap for tps65910 register access. 



Using regmap apis for accessing the device registers and
using RBTREE caching mechanims for caching registers.

Enabling caching of the registers which is used for voltage
controls. By doing this, the modify_bits operation is faster as
it does not involve the i2c register read from device, just read
from cache. This results faster set voltage operation.

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2853378b

drivers/mfd/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ config MFD_TPS65910 
	depends on I2C=y && GPIOLIB

	select MFD_CORE

	select GPIO_TPS65910

	select REGMAP_I2C

	help

	  if you say yes here you get support for the TPS65910 series of

	  Power Management chips.

drivers/mfd/tps65910.c

+46 −77
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/mfd/core.h>

#include <linux/regmap.h>

#include <linux/mfd/tps65910.h>



static struct mfd_cell tps65910s[] = {
@@ -38,98 +40,55 @@ static struct mfd_cell tps65910s[] = { 
static int tps65910_i2c_read(struct tps65910 *tps65910, u8 reg,

				  int bytes, void *dest)

{

	struct i2c_client *i2c = tps65910->i2c_client;

	struct i2c_msg xfer[2];

	int ret;



	/* Write register */

	xfer[0].addr = i2c->addr;

	xfer[0].flags = 0;

	xfer[0].len = 1;

	xfer[0].buf = &reg;



	/* Read data */

	xfer[1].addr = i2c->addr;

	xfer[1].flags = I2C_M_RD;

	xfer[1].len = bytes;

	xfer[1].buf = dest;



	ret = i2c_transfer(i2c->adapter, xfer, 2);

	if (ret == 2)

		ret = 0;

	else if (ret >= 0)

		ret = -EIO;



	return ret;

	return regmap_bulk_read(tps65910->regmap, reg, dest, bytes);

}



static int tps65910_i2c_write(struct tps65910 *tps65910, u8 reg,

				  int bytes, void *src)

{

	struct i2c_client *i2c = tps65910->i2c_client;

	/* we add 1 byte for device register */

	u8 msg[TPS65910_MAX_REGISTER + 1];

	int ret;



	if (bytes > TPS65910_MAX_REGISTER)

		return -EINVAL;



	msg[0] = reg;

	memcpy(&msg[1], src, bytes);



	ret = i2c_master_send(i2c, msg, bytes + 1);

	if (ret < 0)

		return ret;

	if (ret != bytes + 1)

		return -EIO;

	return 0;

	return regmap_bulk_write(tps65910->regmap, reg, src, bytes);

}



int tps65910_set_bits(struct tps65910 *tps65910, u8 reg, u8 mask)

{

	u8 data;

	int err;



	mutex_lock(&tps65910->io_mutex);

	err = tps65910_i2c_read(tps65910, reg, 1, &data);

	if (err) {

		dev_err(tps65910->dev, "read from reg %x failed\n", reg);

		goto out;

	}



	data |= mask;

	err = tps65910_i2c_write(tps65910, reg, 1, &data);

	if (err)

		dev_err(tps65910->dev, "write to reg %x failed\n", reg);



out:

	mutex_unlock(&tps65910->io_mutex);

	return err;

	return regmap_update_bits(tps65910->regmap, reg, mask, mask);

}

EXPORT_SYMBOL_GPL(tps65910_set_bits);



int tps65910_clear_bits(struct tps65910 *tps65910, u8 reg, u8 mask)

{

	u8 data;

	int err;



	mutex_lock(&tps65910->io_mutex);

	err = tps65910_i2c_read(tps65910, reg, 1, &data);

	if (err) {

		dev_err(tps65910->dev, "read from reg %x failed\n", reg);

		goto out;

	return regmap_update_bits(tps65910->regmap, reg, mask, 0);

}

EXPORT_SYMBOL_GPL(tps65910_clear_bits);



	data &= ~mask;

	err = tps65910_i2c_write(tps65910, reg, 1, &data);

	if (err)

		dev_err(tps65910->dev, "write to reg %x failed\n", reg);

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

{

	struct tps65910 *tps65910 = dev_get_drvdata(dev);



out:

	mutex_unlock(&tps65910->io_mutex);

	return err;

	/*

	 * Caching all regulator registers.

	 * All regualator register address range is same for

	 * TPS65910 and TPS65911

	 */

	if ((reg >= TPS65910_VIO) && (reg <= TPS65910_VDAC)) {

		/* Check for non-existing register */

		if (tps65910_chip_id(tps65910) == TPS65910)

			if ((reg == TPS65911_VDDCTRL_OP) ||

				(reg == TPS65911_VDDCTRL_SR))

				return true;

		return false;

	}

EXPORT_SYMBOL_GPL(tps65910_clear_bits);

	return true;

}



static const struct regmap_config rc5t583_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,

	.volatile_reg = is_volatile_reg,

	.max_register = TPS65910_MAX_REGISTER,

	.num_reg_defaults_raw = TPS65910_MAX_REGISTER,

	.cache_type = REGCACHE_RBTREE,

};



static int tps65910_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)
@@ -161,6 +120,13 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, 
	tps65910->write = tps65910_i2c_write;

	mutex_init(&tps65910->io_mutex);



	tps65910->regmap = regmap_init_i2c(i2c, &rc5t583_regmap_config);

	if (IS_ERR(tps65910->regmap)) {

		ret = PTR_ERR(tps65910->regmap);

		dev_err(&i2c->dev, "regmap initialization failed: %d\n", ret);

		goto regmap_err;

	}



	ret = mfd_add_devices(tps65910->dev, -1,

			      tps65910s, ARRAY_SIZE(tps65910s),

			      NULL, 0);
@@ -178,6 +144,8 @@ static int tps65910_i2c_probe(struct i2c_client *i2c, 
	return ret;



err:

	regmap_exit(tps65910->regmap);

regmap_err:

	kfree(tps65910);

	kfree(init_data);

	return ret;
@@ -189,6 +157,7 @@ static int tps65910_i2c_remove(struct i2c_client *i2c) 


	tps65910_irq_exit(tps65910);

	mfd_remove_devices(tps65910->dev);

	regmap_exit(tps65910->regmap);

	kfree(tps65910);



	return 0;

include/linux/mfd/tps65910.h

+1 −0
Original line number Diff line number Diff line
@@ -789,6 +789,7 @@ struct tps65910_board { 
struct tps65910 {

	struct device *dev;

	struct i2c_client *i2c_client;

	struct regmap *regmap;

	struct mutex io_mutex;

	unsigned int id;

	int (*read)(struct tps65910 *tps65910, u8 reg, int size, void *dest);

CRA Git | Maintained and supported by SUSTech CRA and CCSE