nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mfd: tps6105x: Use i2c regmap to access registers

Browse source 
This patch modifies tps6105x and associated function driver to use regmap
instead of operating directly on i2c.

Signed-off-by: Denis Grigoryev <grigoryev@fastwel.ru>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Grigoryev Denis 2015-10-02 16:14:41 +00:00 committed by Lee Jones
parent 1f93e4a96c
commit 7e50711993
3 changed files with 24 additions and 80 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

78
drivers/mfd/tps6105x.c
View file

@ -16,7 +16,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/mutex.h> #include <linux/regmap.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -25,73 +25,18 @@
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/mfd/tps6105x.h> #include <linux/mfd/tps6105x.h>
int tps6105x_set(struct tps6105x *tps6105x, u8 reg, u8 value) static struct regmap_config tps6105x_regmap_config = {
{ .reg_bits = 8,
int ret; .val_bits = 8,
.max_register = TPS6105X_REG_3,
ret = mutex_lock_interruptible(&tps6105x->lock); };
if (ret)
return ret;
ret = i2c_smbus_write_byte_data(tps6105x->client, reg, value);
mutex_unlock(&tps6105x->lock);
if (ret < 0)
return ret;
return 0;
}
EXPORT_SYMBOL(tps6105x_set);
int tps6105x_get(struct tps6105x *tps6105x, u8 reg, u8 *buf)
{
int ret;
ret = mutex_lock_interruptible(&tps6105x->lock);
if (ret)
return ret;
ret = i2c_smbus_read_byte_data(tps6105x->client, reg);
mutex_unlock(&tps6105x->lock);
if (ret < 0)
return ret;
*buf = ret;
return 0;
}
EXPORT_SYMBOL(tps6105x_get);
/*
* Masks off the bits in the mask and sets the bits in the bitvalues
* parameter in one atomic operation
*/
int tps6105x_mask_and_set(struct tps6105x *tps6105x, u8 reg,
u8 bitmask, u8 bitvalues)
{
int ret;
u8 regval;
ret = mutex_lock_interruptible(&tps6105x->lock);
if (ret)
return ret;
ret = i2c_smbus_read_byte_data(tps6105x->client, reg);
if (ret < 0)
goto fail;
regval = ret;
regval = (~bitmask & regval) | (bitmask & bitvalues);
ret = i2c_smbus_write_byte_data(tps6105x->client, reg, regval);
fail:
mutex_unlock(&tps6105x->lock);
if (ret < 0)
return ret;
return 0;
}
EXPORT_SYMBOL(tps6105x_mask_and_set);
static int tps6105x_startup(struct tps6105x *tps6105x) static int tps6105x_startup(struct tps6105x *tps6105x)
{ {
int ret; int ret;
u8 regval; unsigned int regval;
ret = tps6105x_get(tps6105x, TPS6105X_REG_0, &regval); ret = regmap_read(tps6105x->regmap, TPS6105X_REG_0, &regval);
if (ret) if (ret)
return ret; return ret;
switch (regval >> TPS6105X_REG0_MODE_SHIFT) { switch (regval >> TPS6105X_REG0_MODE_SHIFT) {
@ -145,11 +90,14 @@ static int tps6105x_probe(struct i2c_client *client,
if (!tps6105x) if (!tps6105x)
return -ENOMEM; return -ENOMEM;
tps6105x->regmap = devm_regmap_init_i2c(client, &tps6105x_regmap_config);
if (IS_ERR(tps6105x->regmap))
return PTR_ERR(tps6105x->regmap);
i2c_set_clientdata(client, tps6105x); i2c_set_clientdata(client, tps6105x);
tps6105x->client = client; tps6105x->client = client;
pdata = dev_get_platdata(&client->dev); pdata = dev_get_platdata(&client->dev);
tps6105x->pdata = pdata; tps6105x->pdata = pdata;
mutex_init(&tps6105x->lock);
ret = tps6105x_startup(tps6105x); ret = tps6105x_startup(tps6105x);
if (ret) { if (ret) {
@ -198,7 +146,7 @@ static int tps6105x_remove(struct i2c_client *client)
mfd_remove_devices(&client->dev); mfd_remove_devices(&client->dev);
/* Put chip in shutdown mode */ /* Put chip in shutdown mode */
tps6105x_mask_and_set(tps6105x, TPS6105X_REG_0, regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0,
TPS6105X_REG0_MODE_MASK, TPS6105X_REG0_MODE_MASK,
TPS6105X_MODE_SHUTDOWN << TPS6105X_REG0_MODE_SHIFT); TPS6105X_MODE_SHUTDOWN << TPS6105X_REG0_MODE_SHIFT);

16
drivers/regulator/tps6105x-regulator.c
View file

@ -14,7 +14,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/regmap.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
@ -33,7 +33,7 @@ static int tps6105x_regulator_enable(struct regulator_dev *rdev)
int ret; int ret;
/* Activate voltage mode */ /* Activate voltage mode */
ret = tps6105x_mask_and_set(tps6105x, TPS6105X_REG_0, ret = regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0,
TPS6105X_REG0_MODE_MASK, TPS6105X_REG0_MODE_MASK,
TPS6105X_REG0_MODE_VOLTAGE << TPS6105X_REG0_MODE_SHIFT); TPS6105X_REG0_MODE_VOLTAGE << TPS6105X_REG0_MODE_SHIFT);
if (ret) if (ret)
@ -48,7 +48,7 @@ static int tps6105x_regulator_disable(struct regulator_dev *rdev)
int ret; int ret;
/* Set into shutdown mode */ /* Set into shutdown mode */
ret = tps6105x_mask_and_set(tps6105x, TPS6105X_REG_0, ret = regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0,
TPS6105X_REG0_MODE_MASK, TPS6105X_REG0_MODE_MASK,
TPS6105X_REG0_MODE_SHUTDOWN << TPS6105X_REG0_MODE_SHIFT); TPS6105X_REG0_MODE_SHUTDOWN << TPS6105X_REG0_MODE_SHIFT);
if (ret) if (ret)
@ -60,10 +60,10 @@ static int tps6105x_regulator_disable(struct regulator_dev *rdev)
static int tps6105x_regulator_is_enabled(struct regulator_dev *rdev) static int tps6105x_regulator_is_enabled(struct regulator_dev *rdev)
{ {
struct tps6105x *tps6105x = rdev_get_drvdata(rdev); struct tps6105x *tps6105x = rdev_get_drvdata(rdev);
u8 regval; unsigned int regval;
int ret; int ret;
ret = tps6105x_get(tps6105x, TPS6105X_REG_0, &regval); ret = regmap_read(tps6105x->regmap, TPS6105X_REG_0, &regval);
if (ret) if (ret)
return ret; return ret;
regval &= TPS6105X_REG0_MODE_MASK; regval &= TPS6105X_REG0_MODE_MASK;
@ -78,10 +78,10 @@ static int tps6105x_regulator_is_enabled(struct regulator_dev *rdev)
static int tps6105x_regulator_get_voltage_sel(struct regulator_dev *rdev) static int tps6105x_regulator_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct tps6105x *tps6105x = rdev_get_drvdata(rdev); struct tps6105x *tps6105x = rdev_get_drvdata(rdev);
u8 regval; unsigned int regval;
int ret; int ret;
ret = tps6105x_get(tps6105x, TPS6105X_REG_0, &regval); ret = regmap_read(tps6105x->regmap, TPS6105X_REG_0, &regval);
if (ret) if (ret)
return ret; return ret;
@ -96,7 +96,7 @@ static int tps6105x_regulator_set_voltage_sel(struct regulator_dev *rdev,
struct tps6105x *tps6105x = rdev_get_drvdata(rdev); struct tps6105x *tps6105x = rdev_get_drvdata(rdev);
int ret; int ret;
ret = tps6105x_mask_and_set(tps6105x, TPS6105X_REG_0, ret = regmap_update_bits(tps6105x->regmap, TPS6105X_REG_0,
TPS6105X_REG0_VOLTAGE_MASK, TPS6105X_REG0_VOLTAGE_MASK,
selector << TPS6105X_REG0_VOLTAGE_SHIFT); selector << TPS6105X_REG0_VOLTAGE_SHIFT);
if (ret) if (ret)

10
include/linux/mfd/tps6105x.h
View file

@ -10,6 +10,7 @@
#define MFD_TPS6105X_H #define MFD_TPS6105X_H
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/regmap.h>
#include <linux/regulator/machine.h> #include <linux/regulator/machine.h>
/* /*
@ -82,20 +83,15 @@ struct tps6105x_platform_data {
/** /**
* struct tps6105x - state holder for the TPS6105x drivers * struct tps6105x - state holder for the TPS6105x drivers
* @mutex: mutex to serialize I2C accesses
* @i2c_client: corresponding I2C client * @i2c_client: corresponding I2C client
* @regulator: regulator device if used in voltage mode * @regulator: regulator device if used in voltage mode
* @regmap: used for i2c communcation on accessing registers
*/ */
struct tps6105x { struct tps6105x {
struct tps6105x_platform_data *pdata; struct tps6105x_platform_data *pdata;
struct mutex lock;
struct i2c_client *client; struct i2c_client *client;
struct regulator_dev *regulator; struct regulator_dev *regulator;
struct regmap *regmap;
}; };
extern int tps6105x_set(struct tps6105x *tps6105x, u8 reg, u8 value);
extern int tps6105x_get(struct tps6105x *tps6105x, u8 reg, u8 *buf);
extern int tps6105x_mask_and_set(struct tps6105x *tps6105x, u8 reg,
u8 bitmask, u8 bitvalues);
#endif #endif