aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/tps80031-regulator.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index a37ede80abbf..aaab3d73d7bd 100644
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * tps80031-regulator.c -- TI TPS80031 regulator driver. 2 * tps80031-regulator.c -- TI TPS80031 regulator driver.
3 * 3 *
4 * Regulator driver for TITPS80031/TPS80032 Fully Integrated Power 4 * Regulator driver for TI TPS80031/TPS80032 Fully Integrated Power
5 * Management with Power Path and Battery Charger. 5 * Management with Power Path and Battery Charger.
6 * 6 *
7 * Copyright (c) 2012, NVIDIA Corporation. 7 * Copyright (c) 2012, NVIDIA Corporation.
@@ -311,7 +311,7 @@ static int tps80031_vbus_is_enabled(struct regulator_dev *rdev)
311 TPS80031_CHARGERUSB_CTRL3, &ctrl3); 311 TPS80031_CHARGERUSB_CTRL3, &ctrl3);
312 if (ret < 0) { 312 if (ret < 0) {
313 dev_err(ri->dev, "reg 0x%02x read failed, e = %d\n", 313 dev_err(ri->dev, "reg 0x%02x read failed, e = %d\n",
314 TPS80031_CHARGERUSB_CTRL1, ret); 314 TPS80031_CHARGERUSB_CTRL3, ret);
315 return ret; 315 return ret;
316 } 316 }
317 if ((ctrl1 & OPA_MODE_EN) && (ctrl3 & BOOST_HW_PWR_EN)) 317 if ((ctrl1 & OPA_MODE_EN) && (ctrl3 & BOOST_HW_PWR_EN))
@@ -679,7 +679,6 @@ static int __devinit tps80031_regulator_probe(struct platform_device *pdev)
679{ 679{
680 struct tps80031_platform_data *pdata; 680 struct tps80031_platform_data *pdata;
681 struct tps80031_regulator_platform_data *tps_pdata; 681 struct tps80031_regulator_platform_data *tps_pdata;
682 struct tps80031_regulator_info *rinfo;
683 struct tps80031_regulator *ri; 682 struct tps80031_regulator *ri;
684 struct tps80031_regulator *pmic; 683 struct tps80031_regulator *pmic;
685 struct regulator_dev *rdev; 684 struct regulator_dev *rdev;
@@ -703,9 +702,8 @@ static int __devinit tps80031_regulator_probe(struct platform_device *pdev)
703 702
704 for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) { 703 for (num = 0; num < TPS80031_REGULATOR_MAX; ++num) {
705 tps_pdata = pdata->regulator_pdata[num]; 704 tps_pdata = pdata->regulator_pdata[num];
706 rinfo = &tps80031_rinfo[num];
707 ri = &pmic[num]; 705 ri = &pmic[num];
708 ri->rinfo = rinfo; 706 ri->rinfo = &tps80031_rinfo[num];
709 ri->dev = &pdev->dev; 707 ri->dev = &pdev->dev;
710 708
711 check_smps_mode_mult(pdev->dev.parent, ri); 709 check_smps_mode_mult(pdev->dev.parent, ri);
@@ -788,6 +786,6 @@ static void __exit tps80031_regulator_exit(void)
788module_exit(tps80031_regulator_exit); 786module_exit(tps80031_regulator_exit);
789 787
790MODULE_ALIAS("platform:tps80031-regulator"); 788MODULE_ALIAS("platform:tps80031-regulator");
791MODULE_DESCRIPTION("Regulator Driver for TI TPS80031 PMIC"); 789MODULE_DESCRIPTION("Regulator Driver for TI TPS80031/TPS80032 PMIC");
792MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>"); 790MODULE_AUTHOR("Laxman Dewangan <ldewangan@nvidia.com>");
793MODULE_LICENSE("GPL v2"); 791MODULE_LICENSE("GPL v2");