diff options
Diffstat (limited to 'recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch')
| -rw-r--r-- | recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch | 418 |
1 files changed, 418 insertions, 0 deletions
diff --git a/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch b/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch new file mode 100644 index 0000000000..2bd9ac174b --- /dev/null +++ b/recipes/linux/linux-davinci/0004-tps6507x_regulator_naming_change.patch @@ -0,0 +1,418 @@ +Index: git/drivers/regulator/tps6507x-regulator.c +=================================================================== +--- git.orig/drivers/regulator/tps6507x-regulator.c 2010-01-09 17:30:10.000000000 -0700 ++++ git/drivers/regulator/tps6507x-regulator.c 2010-01-09 17:31:39.000000000 -0700 +@@ -113,23 +113,23 @@ + struct mutex io_lock; + }; + +-static inline int tps_6507x_read(struct tps_pmic *tps, u8 reg) ++static inline int tps6507x_pmic_read(struct tps_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 tps_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 tps_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; +@@ -137,7 +137,7 @@ + } + + 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); + +@@ -146,13 +146,13 @@ + return err; + } + +-static int tps_6507x_clear_bits(struct tps_pmic *tps, u8 reg, u8 mask) ++static int tps6507x_pmic_clear_bits(struct tps_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; +@@ -160,7 +160,7 @@ + } + + 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); + +@@ -169,13 +169,13 @@ + return err; + } + +-static int tps_6507x_reg_read(struct tps_pmic *tps, u8 reg) ++static int tps6507x_pmic_reg_read(struct tps_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); + +@@ -183,13 +183,13 @@ + return data; + } + +-static int tps_6507x_reg_write(struct tps_pmic *tps, u8 reg, u8 val) ++static int tps6507x_pmic_reg_write(struct tps_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); + +@@ -197,7 +197,7 @@ + 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); + int data, dcdc = rdev_get_id(dev); +@@ -207,7 +207,7 @@ + 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; +@@ -215,7 +215,7 @@ + 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); + int data, ldo = rdev_get_id(dev); +@@ -225,7 +225,7 @@ + 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; +@@ -233,7 +233,7 @@ + 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); + int dcdc = rdev_get_id(dev); +@@ -243,10 +243,10 @@ + 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); + int dcdc = rdev_get_id(dev); +@@ -256,10 +256,10 @@ + 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); + int ldo = rdev_get_id(dev); +@@ -269,10 +269,10 @@ + 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); + int ldo = rdev_get_id(dev); +@@ -282,10 +282,10 @@ + 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); + int data, dcdc = rdev_get_id(dev); +@@ -311,7 +311,7 @@ + return -EINVAL; + } + +- data = tps_6507x_reg_read(tps, reg); ++ data = tps6507x_pmic_reg_read(tps, reg); + if (data < 0) + return data; + +@@ -319,7 +319,7 @@ + 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); +@@ -366,17 +366,17 @@ + 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); + int data, ldo = rdev_get_id(dev); +@@ -392,7 +392,7 @@ + TPS6507X_REG_DEFLDO2_LDO2_MASK); + } + +- data = tps_6507x_reg_read(tps, reg); ++ data = tps6507x_pmic_reg_read(tps, reg); + if (data < 0) + return data; + +@@ -400,7 +400,7 @@ + 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); +@@ -434,17 +434,17 @@ + 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); +@@ -459,7 +459,7 @@ + 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); +@@ -475,27 +475,27 @@ + } + + /* 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 tps_6507x_probe(struct i2c_client *client, const struct i2c_device_id *id) ++int tps6507x_pmic_probe(struct i2c_client *client, const struct i2c_device_id *id) + { + static int desc_id; + struct tps_info *info = (void *)id->driver_data; +@@ -546,7 +546,7 @@ + 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; + +@@ -579,12 +579,12 @@ + } + + /** +- * 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); + int i; +@@ -601,7 +601,7 @@ + return 0; + } + +-static const struct tps_info tps6507x_regs[] = { ++static const struct tps_info tps6507x_pmic_regs[] = { + { + .name = "VDCDC1", + .min_uV = 725000, +@@ -639,44 +639,44 @@ + }, + }; + +-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"); |