Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8620ca9f authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Mark Brown
Browse files

regulator: tps65090: rename driver name and regulator name 



To make the names proper and more appropriate:
Rename the driver name from tps65090-regulator to tps65090-pmic.
Rename the regulators from TPS65090_ID_* to TPS65090_REGULATOR_*

Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 24282a1c

drivers/regulator/tps65090-regulator.c

+8 −8
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct regulator_ops tps65090_ops = { 
{							\

	.name = "TPS65090_RAILS"#_id,			\

	.supply_name = _sname,				\

	.id = TPS65090_ID_##_id,			\

	.id = TPS65090_REGULATOR_##_id,			\

	.ops = &_ops,					\

	.enable_reg = _en_reg,				\

	.enable_mask = BIT(0),				\
@@ -65,9 +65,9 @@ static struct regulator_desc tps65090_regulator_desc[] = { 
static inline bool is_dcdc(int id)

{

	switch (id) {

	case TPS65090_ID_DCDC1:

	case TPS65090_ID_DCDC2:

	case TPS65090_ID_DCDC3:

	case TPS65090_REGULATOR_DCDC1:

	case TPS65090_REGULATOR_DCDC2:

	case TPS65090_REGULATOR_DCDC3:

		return true;

	default:

		return false;
@@ -133,14 +133,14 @@ static int __devinit tps65090_regulator_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	pmic = devm_kzalloc(&pdev->dev, TPS65090_ID_MAX * sizeof(*pmic),

	pmic = devm_kzalloc(&pdev->dev, TPS65090_REGULATOR_MAX * sizeof(*pmic),

			GFP_KERNEL);

	if (!pmic) {

		dev_err(&pdev->dev, "mem alloc for pmic failed\n");

		return -ENOMEM;

	}



	for (num = 0; num < TPS65090_ID_MAX; num++) {

	for (num = 0; num < TPS65090_REGULATOR_MAX; num++) {

		tps_pdata = tps65090_pdata->reg_pdata[num];



		ri = &pmic[num];
@@ -196,7 +196,7 @@ static int __devexit tps65090_regulator_remove(struct platform_device *pdev) 
	struct tps65090_regulator *ri;

	int num;



	for (num = 0; num < TPS65090_ID_MAX; ++num) {

	for (num = 0; num < TPS65090_REGULATOR_MAX; ++num) {

		ri = &pmic[num];

		regulator_unregister(ri->rdev);

	}
@@ -205,7 +205,7 @@ static int __devexit tps65090_regulator_remove(struct platform_device *pdev) 


static struct platform_driver tps65090_regulator_driver = {

	.driver	= {

		.name	= "tps65090-regulator",

		.name	= "tps65090-pmic",

		.owner	= THIS_MODULE,

	},

	.probe		= tps65090_regulator_probe,

include/linux/mfd/tps65090.h

+12 −12
Original line number Diff line number Diff line
@@ -26,19 +26,19 @@ 


/* TPS65090 Regulator ID */

enum {

	TPS65090_ID_DCDC1,

	TPS65090_ID_DCDC2,

	TPS65090_ID_DCDC3,

	TPS65090_ID_FET1,

	TPS65090_ID_FET2,

	TPS65090_ID_FET3,

	TPS65090_ID_FET4,

	TPS65090_ID_FET5,

	TPS65090_ID_FET6,

	TPS65090_ID_FET7,

	TPS65090_REGULATOR_DCDC1,

	TPS65090_REGULATOR_DCDC2,

	TPS65090_REGULATOR_DCDC3,

	TPS65090_REGULATOR_FET1,

	TPS65090_REGULATOR_FET2,

	TPS65090_REGULATOR_FET3,

	TPS65090_REGULATOR_FET4,

	TPS65090_REGULATOR_FET5,

	TPS65090_REGULATOR_FET6,

	TPS65090_REGULATOR_FET7,



	/* Last entry for maximum ID */

	TPS65090_ID_MAX,

	TPS65090_REGULATOR_MAX,

};



struct tps65090 {
@@ -72,7 +72,7 @@ struct tps65090_platform_data { 
	int irq_base;

	int num_subdevs;

	struct tps65090_subdev_info *subdevs;

	struct tps65090_regulator_plat_data *reg_pdata[TPS65090_ID_MAX];

	struct tps65090_regulator_plat_data *reg_pdata[TPS65090_REGULATOR_MAX];

};



/*