Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 319783
b: refs/heads/master
c: 1176b5b
h: refs/heads/master
i:
  319781: a28f34e
  319779: 1ba343d
  319775: 99a7831
v: v3
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed Jul 24, 2012
1 parent 3a343b0 commit 02c1a45
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 112 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b6719412dc28458f3c142a27bf3e0d2ab3ce0573
refs/heads/master: 1176b5be67692e910c8d4b055902c314e7249e36
1 change: 1 addition & 0 deletions trunk/drivers/mfd/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ config MFD_TPS6586X
bool "TPS6586x Power Management chips"
depends on I2C=y && GPIOLIB && GENERIC_HARDIRQS
select MFD_CORE
select REGMAP_I2C
depends on REGULATOR
help
If you say yes here you get support for the TPS6586X series of
Expand Down
157 changes: 46 additions & 111 deletions trunk/drivers/mfd/tps6586x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
#include <linux/regmap.h>
#include <linux/regulator/of_regulator.h>

#include <linux/mfd/core.h>
Expand All @@ -48,6 +50,9 @@
/* device id */
#define TPS6586X_VERSIONCRC 0xcd

/* Maximum register */
#define TPS6586X_MAX_REGISTER (TPS6586X_VERSIONCRC + 1)

struct tps6586x_irq_data {
u8 mask_reg;
u8 mask_mask;
Expand Down Expand Up @@ -90,9 +95,9 @@ static const struct tps6586x_irq_data tps6586x_irqs[] = {
};

struct tps6586x {
struct mutex lock;
struct device *dev;
struct i2c_client *client;
struct regmap *regmap;

struct gpio_chip gpio;
struct irq_chip irq_chip;
Expand All @@ -103,152 +108,69 @@ struct tps6586x {
u8 mask_reg[5];
};

static inline int __tps6586x_read(struct i2c_client *client,
int reg, uint8_t *val)
static inline struct tps6586x *dev_to_tps6586x(struct device *dev)
{
int ret;

ret = i2c_smbus_read_byte_data(client, reg);
if (ret < 0) {
dev_err(&client->dev, "failed reading at 0x%02x\n", reg);
return ret;
}

*val = (uint8_t)ret;

return 0;
}

static inline int __tps6586x_reads(struct i2c_client *client, int reg,
int len, uint8_t *val)
{
int ret;

ret = i2c_smbus_read_i2c_block_data(client, reg, len, val);
if (ret < 0) {
dev_err(&client->dev, "failed reading from 0x%02x\n", reg);
return ret;
}

return 0;
}

static inline int __tps6586x_write(struct i2c_client *client,
int reg, uint8_t val)
{
int ret;

ret = i2c_smbus_write_byte_data(client, reg, val);
if (ret < 0) {
dev_err(&client->dev, "failed writing 0x%02x to 0x%02x\n",
val, reg);
return ret;
}

return 0;
}

static inline int __tps6586x_writes(struct i2c_client *client, int reg,
int len, uint8_t *val)
{
int ret, i;

for (i = 0; i < len; i++) {
ret = __tps6586x_write(client, reg + i, *(val + i));
if (ret < 0)
return ret;
}

return 0;
return i2c_get_clientdata(to_i2c_client(dev));
}

int tps6586x_write(struct device *dev, int reg, uint8_t val)
{
return __tps6586x_write(to_i2c_client(dev), reg, val);
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

return regmap_write(tps6586x->regmap, reg, val);
}
EXPORT_SYMBOL_GPL(tps6586x_write);

int tps6586x_writes(struct device *dev, int reg, int len, uint8_t *val)
{
return __tps6586x_writes(to_i2c_client(dev), reg, len, val);
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

return regmap_bulk_write(tps6586x->regmap, reg, val, len);
}
EXPORT_SYMBOL_GPL(tps6586x_writes);

int tps6586x_read(struct device *dev, int reg, uint8_t *val)
{
return __tps6586x_read(to_i2c_client(dev), reg, val);
struct tps6586x *tps6586x = dev_to_tps6586x(dev);
unsigned int rval;
int ret;

ret = regmap_read(tps6586x->regmap, reg, &rval);
if (!ret)
*val = rval;
return ret;
}
EXPORT_SYMBOL_GPL(tps6586x_read);

int tps6586x_reads(struct device *dev, int reg, int len, uint8_t *val)
{
return __tps6586x_reads(to_i2c_client(dev), reg, len, val);
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

return regmap_bulk_read(tps6586x->regmap, reg, val, len);
}
EXPORT_SYMBOL_GPL(tps6586x_reads);

int tps6586x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
{
struct tps6586x *tps6586x = dev_get_drvdata(dev);
uint8_t reg_val;
int ret = 0;

mutex_lock(&tps6586x->lock);

ret = __tps6586x_read(to_i2c_client(dev), reg, &reg_val);
if (ret)
goto out;
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

if ((reg_val & bit_mask) != bit_mask) {
reg_val |= bit_mask;
ret = __tps6586x_write(to_i2c_client(dev), reg, reg_val);
}
out:
mutex_unlock(&tps6586x->lock);
return ret;
return regmap_update_bits(tps6586x->regmap, reg, bit_mask, bit_mask);
}
EXPORT_SYMBOL_GPL(tps6586x_set_bits);

int tps6586x_clr_bits(struct device *dev, int reg, uint8_t bit_mask)
{
struct tps6586x *tps6586x = dev_get_drvdata(dev);
uint8_t reg_val;
int ret = 0;
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

mutex_lock(&tps6586x->lock);

ret = __tps6586x_read(to_i2c_client(dev), reg, &reg_val);
if (ret)
goto out;

if (reg_val & bit_mask) {
reg_val &= ~bit_mask;
ret = __tps6586x_write(to_i2c_client(dev), reg, reg_val);
}
out:
mutex_unlock(&tps6586x->lock);
return ret;
return regmap_update_bits(tps6586x->regmap, reg, bit_mask, 0);
}
EXPORT_SYMBOL_GPL(tps6586x_clr_bits);

int tps6586x_update(struct device *dev, int reg, uint8_t val, uint8_t mask)
{
struct tps6586x *tps6586x = dev_get_drvdata(dev);
uint8_t reg_val;
int ret = 0;

mutex_lock(&tps6586x->lock);

ret = __tps6586x_read(tps6586x->client, reg, &reg_val);
if (ret)
goto out;
struct tps6586x *tps6586x = dev_to_tps6586x(dev);

if ((reg_val & mask) != val) {
reg_val = (reg_val & ~mask) | val;
ret = __tps6586x_write(tps6586x->client, reg, reg_val);
}
out:
mutex_unlock(&tps6586x->lock);
return ret;
return regmap_update_bits(tps6586x->regmap, reg, mask, val);
}
EXPORT_SYMBOL_GPL(tps6586x_update);

Expand All @@ -258,7 +180,7 @@ static int tps6586x_gpio_get(struct gpio_chip *gc, unsigned offset)
uint8_t val;
int ret;

ret = __tps6586x_read(tps6586x->client, TPS6586X_GPIOSET2, &val);
ret = tps6586x_read(tps6586x->dev, TPS6586X_GPIOSET2, &val);
if (ret)
return ret;

Expand Down Expand Up @@ -556,6 +478,12 @@ static struct tps6586x_platform_data *tps6586x_parse_dt(struct i2c_client *clien
}
#endif

static const struct regmap_config tps6586x_regmap_config = {
.reg_bits = 8,
.val_bits = 8,
.max_register = TPS6586X_MAX_REGISTER - 1,
};

static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
Expand Down Expand Up @@ -589,7 +517,14 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
tps6586x->dev = &client->dev;
i2c_set_clientdata(client, tps6586x);

mutex_init(&tps6586x->lock);
tps6586x->regmap = devm_regmap_init_i2c(client,
&tps6586x_regmap_config);
if (IS_ERR(tps6586x->regmap)) {
ret = PTR_ERR(tps6586x->regmap);
dev_err(&client->dev, "regmap init failed: %d\n", ret);
return ret;
}


if (client->irq) {
ret = tps6586x_irq_init(tps6586x, client->irq,
Expand Down

0 comments on commit 02c1a45

Please sign in to comment.