Skip to content

L
linux-davinci
Commit 01296aa6 authored by Todd Fischer's avatar Todd Fischer Committed by Kevin Hilman
Browse files
Options

-V3 Cleaned up name space so each MFD sub-driver uses a different name space. 

Move from using tps or tsp6507x to tps6057x_pmic in a consistent manner.
Signed-off-by: default avatarTodd Fischer <todd.fischer@ridgerun.com>
parent e2d753bc
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 85 deletions
drivers/regulator/tps6507x-regulator.c
View file @ 01296aa6
......@@ -104,7 +104,7 @@ struct tps_info {
const u16 *table;
};
struct tps_pmic {
struct tps6507x_pmic {
struct regulator_desc desc[TPS6507X_NUM_REGULATOR];
struct i2c_client *client;
struct regulator_dev *rdev[TPS6507X_NUM_REGULATOR];
......@@ -112,23 +112,23 @@ struct tps_pmic {
struct mutex io_lock;
};
static inline int tps_6507x_read(struct tps_pmic *tps, u8 reg)
static inline int tps6507x_pmic_read(struct tps6507x_pmic *tps, u8 reg)
{
return i2c_smbus_read_byte_data(tps->client, reg);
}
static inline int tps_6507x_write(struct tps_pmic *tps, u8 reg, u8 val)
static inline int tps6507x_pmic_write(struct tps6507x_pmic *tps, u8 reg, u8 val)
{
return i2c_smbus_write_byte_data(tps->client, reg, val);
}
static int tps_6507x_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
static int tps6507x_pmic_set_bits(struct tps6507x_pmic *tps, u8 reg, u8 mask)
{
int err, data;
mutex_lock(&tps->io_lock);
data = tps_6507x_read(tps, reg);
data = tps6507x_pmic_read(tps, reg);
if (data < 0) {
dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
err = data;
......@@ -136,7 +136,7 @@ static int tps_6507x_set_bits(struct tps_pmic *tps, u8 reg, u8 mask)
}
data |= mask;
err = tps_6507x_write(tps, reg, data);
err = tps6507x_pmic_write(tps, reg, data);
if (err)
dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
......@@ -145,13 +145,13 @@ out:
return err;
}
static int tps_6507x_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
static int tps6507x_pmic_clear_bits(struct tps6507x_pmic *tps, u8 reg, u8 mask)
{
int err, data;
mutex_lock(&tps->io_lock);
data = tps_6507x_read(tps, reg);
data = tps6507x_pmic_read(tps, reg);
if (data < 0) {
dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
err = data;
......@@ -159,7 +159,7 @@ static int tps_6507x_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask)
}
data &= ~mask;
err = tps_6507x_write(tps, reg, data);
err = tps6507x_pmic_write(tps, reg, data);
if (err)
dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
......@@ -168,13 +168,13 @@ out:
return err;
}
static int tps_6507x_reg_read(struct tps_pmic *tps, u8 reg)
static int tps6507x_pmic_reg_read(struct tps6507x_pmic *tps, u8 reg)
{
int data;
mutex_lock(&tps->io_lock);
data = tps_6507x_read(tps, reg);
data = tps6507x_pmic_read(tps, reg);
if (data < 0)
dev_err(&tps->client->dev, "Read from reg 0x%x failed\n", reg);
......@@ -182,13 +182,13 @@ static int tps_6507x_reg_read(struct tps_pmic *tps, u8 reg)
return data;
}
static int tps_6507x_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
static int tps6507x_pmic_reg_write(struct tps6507x_pmic *tps, u8 reg, u8 val)
{
int err;
mutex_lock(&tps->io_lock);
err = tps_6507x_write(tps, reg, val);
err = tps6507x_pmic_write(tps, reg, val);
if (err < 0)
dev_err(&tps->client->dev, "Write for reg 0x%x failed\n", reg);
......@@ -196,9 +196,9 @@ static int tps_6507x_reg_write(struct tps_pmic *tps, u8 reg, u8 val)
return err;
}
static int tps6507x_dcdc_is_enabled(struct regulator_dev *dev)
static int tps6507x_pmic_dcdc_is_enabled(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, dcdc = rdev_get_id(dev);
u8 shift;
......@@ -206,7 +206,7 @@ static int tps6507x_dcdc_is_enabled(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - dcdc;
data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
data = tps6507x_pmic_reg_read(tps, TPS6507X_REG_CON_CTRL1);
if (data < 0)
return data;
......@@ -214,9 +214,9 @@ static int tps6507x_dcdc_is_enabled(struct regulator_dev *dev)
return (data & 1<<shift) ? 1 : 0;
}
static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
static int tps6507x_pmic_ldo_is_enabled(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, ldo = rdev_get_id(dev);
u8 shift;
......@@ -224,7 +224,7 @@ static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - ldo;
data = tps_6507x_reg_read(tps, TPS6507X_REG_CON_CTRL1);
data = tps6507x_pmic_reg_read(tps, TPS6507X_REG_CON_CTRL1);
if (data < 0)
return data;
......@@ -232,9 +232,9 @@ static int tps6507x_ldo_is_enabled(struct regulator_dev *dev)
return (data & 1<<shift) ? 1 : 0;
}
static int tps6507x_dcdc_enable(struct regulator_dev *dev)
static int tps6507x_pmic_dcdc_enable(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int dcdc = rdev_get_id(dev);
u8 shift;
......@@ -242,12 +242,12 @@ static int tps6507x_dcdc_enable(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - dcdc;
return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
return tps6507x_pmic_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
}
static int tps6507x_dcdc_disable(struct regulator_dev *dev)
static int tps6507x_pmic_dcdc_disable(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int dcdc = rdev_get_id(dev);
u8 shift;
......@@ -255,12 +255,13 @@ static int tps6507x_dcdc_disable(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - dcdc;
return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1,
1 << shift);
}
static int tps6507x_ldo_enable(struct regulator_dev *dev)
static int tps6507x_pmic_ldo_enable(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int ldo = rdev_get_id(dev);
u8 shift;
......@@ -268,12 +269,12 @@ static int tps6507x_ldo_enable(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - ldo;
return tps_6507x_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
return tps6507x_pmic_set_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
}
static int tps6507x_ldo_disable(struct regulator_dev *dev)
static int tps6507x_pmic_ldo_disable(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int ldo = rdev_get_id(dev);
u8 shift;
......@@ -281,12 +282,13 @@ static int tps6507x_ldo_disable(struct regulator_dev *dev)
return -EINVAL;
shift = TPS6507X_MAX_REG_ID - ldo;
return tps_6507x_clear_bits(tps, TPS6507X_REG_CON_CTRL1, 1 << shift);
return tps6507x_pmic_clear_bits(tps, TPS6507X_REG_CON_CTRL1,
1 << shift);
}
static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
static int tps6507x_pmic_dcdc_get_voltage(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, dcdc = rdev_get_id(dev);
u8 reg;
......@@ -304,7 +306,7 @@ static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
return -EINVAL;
}
data = tps_6507x_reg_read(tps, reg);
data = tps6507x_pmic_reg_read(tps, reg);
if (data < 0)
return data;
......@@ -312,10 +314,10 @@ static int tps6507x_dcdc_get_voltage(struct regulator_dev *dev)
return tps->info[dcdc]->table[data] * 1000;
}
static int tps6507x_dcdc_set_voltage(struct regulator_dev *dev,
static int tps6507x_pmic_dcdc_set_voltage(struct regulator_dev *dev,
int min_uV, int max_uV)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, vsel, dcdc = rdev_get_id(dev);
u8 reg;
......@@ -353,19 +355,19 @@ static int tps6507x_dcdc_set_voltage(struct regulator_dev *dev,
if (vsel == tps->info[dcdc]->table_len)
return -EINVAL;
data = tps_6507x_reg_read(tps, reg);
data = tps6507x_pmic_reg_read(tps, reg);
if (data < 0)
return data;
data &= ~TPS6507X_DEFDCDCX_DCDC_MASK;
data |= vsel;
return tps_6507x_reg_write(tps, reg, data);
return tps6507x_pmic_reg_write(tps, reg, data);
}
static int tps6507x_ldo_get_voltage(struct regulator_dev *dev)
static int tps6507x_pmic_ldo_get_voltage(struct regulator_dev *dev)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, ldo = rdev_get_id(dev);
u8 reg, mask;
......@@ -379,7 +381,7 @@ static int tps6507x_ldo_get_voltage(struct regulator_dev *dev)
TPS6507X_REG_DEFLDO2_LDO2_MASK);
}
data = tps_6507x_reg_read(tps, reg);
data = tps6507x_pmic_reg_read(tps, reg);
if (data < 0)
return data;
......@@ -387,10 +389,10 @@ static int tps6507x_ldo_get_voltage(struct regulator_dev *dev)
return tps->info[ldo]->table[data] * 1000;
}
static int tps6507x_ldo_set_voltage(struct regulator_dev *dev,
static int tps6507x_pmic_ldo_set_voltage(struct regulator_dev *dev,
int min_uV, int max_uV)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int data, vsel, ldo = rdev_get_id(dev);
u8 reg, mask;
......@@ -421,20 +423,20 @@ static int tps6507x_ldo_set_voltage(struct regulator_dev *dev,
if (vsel == tps->info[ldo]->table_len)
return -EINVAL;
data = tps_6507x_reg_read(tps, reg);
data = tps6507x_pmic_reg_read(tps, reg);
if (data < 0)
return data;
data &= ~mask;
data |= vsel;
return tps_6507x_reg_write(tps, reg, data);
return tps6507x_pmic_reg_write(tps, reg, data);
}
static int tps6507x_dcdc_list_voltage(struct regulator_dev *dev,
static int tps6507x_pmic_dcdc_list_voltage(struct regulator_dev *dev,
unsigned selector)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int dcdc = rdev_get_id(dev);
if (dcdc < TPS6507X_DCDC_1 || dcdc > TPS6507X_DCDC_3)
......@@ -446,10 +448,10 @@ static int tps6507x_dcdc_list_voltage(struct regulator_dev *dev,
return tps->info[dcdc]->table[selector] * 1000;
}
static int tps6507x_ldo_list_voltage(struct regulator_dev *dev,
static int tps6507x_pmic_ldo_list_voltage(struct regulator_dev *dev,
unsigned selector)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
struct tps6507x_pmic *tps = rdev_get_drvdata(dev);
int ldo = rdev_get_id(dev);
if (ldo < TPS6507X_LDO_1 || ldo > TPS6507X_LDO_2)
......@@ -462,33 +464,33 @@ static int tps6507x_ldo_list_voltage(struct regulator_dev *dev,
}
/* Operations permitted on VDCDCx */
static struct regulator_ops tps6507x_dcdc_ops = {
.is_enabled = tps6507x_dcdc_is_enabled,
.enable = tps6507x_dcdc_enable,
.disable = tps6507x_dcdc_disable,
.get_voltage = tps6507x_dcdc_get_voltage,
.set_voltage = tps6507x_dcdc_set_voltage,
.list_voltage = tps6507x_dcdc_list_voltage,
static struct regulator_ops tps6507x_pmic_dcdc_ops = {
.is_enabled = tps6507x_pmic_dcdc_is_enabled,
.enable = tps6507x_pmic_dcdc_enable,
.disable = tps6507x_pmic_dcdc_disable,
.get_voltage = tps6507x_pmic_dcdc_get_voltage,
.set_voltage = tps6507x_pmic_dcdc_set_voltage,
.list_voltage = tps6507x_pmic_dcdc_list_voltage,
};
/* Operations permitted on LDOx */
static struct regulator_ops tps6507x_ldo_ops = {
.is_enabled = tps6507x_ldo_is_enabled,
.enable = tps6507x_ldo_enable,
.disable = tps6507x_ldo_disable,
.get_voltage = tps6507x_ldo_get_voltage,
.set_voltage = tps6507x_ldo_set_voltage,
.list_voltage = tps6507x_ldo_list_voltage,
static struct regulator_ops tps6507x_pmic_ldo_ops = {
.is_enabled = tps6507x_pmic_ldo_is_enabled,
.enable = tps6507x_pmic_ldo_enable,
.disable = tps6507x_pmic_ldo_disable,
.get_voltage = tps6507x_pmic_ldo_get_voltage,
.set_voltage = tps6507x_pmic_ldo_set_voltage,
.list_voltage = tps6507x_pmic_ldo_list_voltage,
};
static int __devinit tps_6507x_probe(struct i2c_client *client,
static int __devinit tps6507x_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
static int desc_id;
const struct tps_info *info = (void *)id->driver_data;
struct regulator_init_data *init_data;
struct regulator_dev *rdev;
struct tps_pmic *tps;
struct tps6507x_pmic *tps;
struct tps6507x_board *tps_board;
int i;
int error;
......@@ -530,7 +532,7 @@ static int __devinit tps_6507x_probe(struct i2c_client *client,
tps->desc[i].id = desc_id++;
tps->desc[i].n_voltages = num_voltages[i];
tps->desc[i].ops = (i > TPS6507X_DCDC_3 ?
&tps6507x_ldo_ops : &tps6507x_dcdc_ops);
&tps6507x_pmic_ldo_ops : &tps6507x_pmic_dcdc_ops);
tps->desc[i].type = REGULATOR_VOLTAGE;
tps->desc[i].owner = THIS_MODULE;
......@@ -560,14 +562,14 @@ fail:
}
/**
* tps_6507x_remove - TPS6507x driver i2c remove handler
* tps6507x_remove - TPS6507x driver i2c remove handler
* @client: i2c driver client device structure
*
* Unregister TPS driver as an i2c client device driver
*/
static int __devexit tps_6507x_remove(struct i2c_client *client)
static int __devexit tps6507x_pmic_remove(struct i2c_client *client)
{
struct tps_pmic *tps = i2c_get_clientdata(client);
struct tps6507x_pmic *tps = i2c_get_clientdata(client);
int i;
/* clear the client data in i2c */
......@@ -581,7 +583,7 @@ static int __devexit tps_6507x_remove(struct i2c_client *client)
return 0;
}
static const struct tps_info tps6507x_regs[] = {
static const struct tps_info tps6507x_pmic_regs[] = {
{
.name = "VDCDC1",
.min_uV = 725000,
......@@ -619,44 +621,44 @@ static const struct tps_info tps6507x_regs[] = {
},
};
static const struct i2c_device_id tps_6507x_id[] = {
static const struct i2c_device_id tps6507x_pmic_id[] = {
{.name = "tps6507x",
.driver_data = (unsigned long) tps6507x_regs,},
.driver_data = (unsigned long) tps6507x_pmic_regs,},
{ },
};
MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
MODULE_DEVICE_TABLE(i2c, tps6507x_pmic_id);
static struct i2c_driver tps_6507x_i2c_driver = {
static struct i2c_driver tps6507x_i2c_driver = {
.driver = {
.name = "tps6507x",
.owner = THIS_MODULE,
},
.probe = tps_6507x_probe,
.remove = __devexit_p(tps_6507x_remove),
.id_table = tps_6507x_id,
.probe = tps6507x_pmic_probe,
.remove = __devexit_p(tps6507x_pmic_remove),
.id_table = tps6507x_pmic_id,
};
/**
* tps_6507x_init
* tps6507x_pmic_init
*
* Module init function
*/
static int __init tps_6507x_init(void)
static int __init tps6507x_pmic_init(void)
{
return i2c_add_driver(&tps_6507x_i2c_driver);
return i2c_add_driver(&tps6507x_i2c_driver);
}
subsys_initcall(tps_6507x_init);
subsys_initcall(tps6507x_pmic_init);
/**
* tps_6507x_cleanup
* tps6507x_pmic_cleanup
*
* Module exit function
*/
static void __exit tps_6507x_cleanup(void)
static void __exit tps6507x_pmic_cleanup(void)
{
i2c_del_driver(&tps_6507x_i2c_driver);
i2c_del_driver(&tps6507x_i2c_driver);
}
module_exit(tps_6507x_cleanup);
module_exit(tps6507x_pmic_cleanup);
MODULE_AUTHOR("Texas Instruments");
MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment