From: Mustapha Ben Zoubeir <mustapha.ben.zoubeir-no...@stericsson.com>
The fixed_uV property residing in ab8500_ext_regulator_info is
currently unused. We remove it here.
Signed-off-by: Mustapha Ben Zoubeir <mustapha.ben.zoubeir-no...@stericsson.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Reviewed-by: Daniel WILLERUD <daniel.wille...@stericsson.com>
Reviewed-by: Mattias WALLIN <mattias.wal...@stericsson.com>
Tested-by: Philippe LANGLAIS <philippe.langl...@stericsson.com>
---
drivers/regulator/ab8500-ext.c | 45 ++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index e5e6453..f75d4f7 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -30,7 +30,6 @@
* @rdev: regulator device
* @cfg: regulator configuration (extension of regulator FW configuration)
* @is_enabled: status of regulator (on/off)
- * @fixed_uV: typical voltage (for fixed voltage supplies)
* @update_bank: bank to control on/off
* @update_reg: register to control on/off
* @update_mask: mask to enable/disable and set mode of regulator
@@ -48,7 +47,6 @@ struct ab8500_ext_regulator_info {
struct regulator_dev *rdev;
struct ab8500_ext_regulator_cfg *cfg;
bool is_enabled;
- int fixed_uV;
u8 update_bank;
u8 update_reg;
u8 update_mask;
@@ -259,30 +257,33 @@ static unsigned int ab8500_ext_regulator_get_mode(struct
regulator_dev *rdev)
static int ab8500_ext_fixed_get_voltage(struct regulator_dev *rdev)
{
- struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
+ struct regulation_constraints *regu_constraints = rdev->constraints;
- if (info == NULL) {
- dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ if (regu_constraints == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator constraints null
pointer\n");
return -EINVAL;
}
-
- return info->fixed_uV;
+ if (regu_constraints->min_uV && regu_constraints->max_uV) {
+ if (regu_constraints->min_uV == regu_constraints->max_uV)
+ return regu_constraints->min_uV;
+ }
+ return -EINVAL;
}
static int ab8500_ext_list_voltage(struct regulator_dev *rdev,
unsigned selector)
{
- struct ab8500_ext_regulator_info *info = rdev_get_drvdata(rdev);
+ struct regulation_constraints *regu_constraints = rdev->constraints;
- if (info == NULL) {
- dev_err(rdev_get_dev(rdev), "regulator info null pointer\n");
+ if (regu_constraints == NULL) {
+ dev_err(rdev_get_dev(rdev), "regulator constraints null
pointer\n");
return -EINVAL;
}
-
/* return the uV for the fixed regulators */
- if (info->fixed_uV)
- return info->fixed_uV;
-
+ if (regu_constraints->min_uV && regu_constraints->max_uV) {
+ if (regu_constraints->min_uV == regu_constraints->max_uV)
+ return regu_constraints->min_uV;
+ }
return -EINVAL;
}
@@ -319,7 +320,6 @@ static struct ab8500_ext_regulator_info
.owner = THIS_MODULE,
.n_voltages = 1,
},
- .fixed_uV = 1800000,
.update_bank = 0x04,
.update_reg = 0x08,
.update_mask = 0x03,
@@ -337,7 +337,6 @@ static struct ab8500_ext_regulator_info
.owner = THIS_MODULE,
.n_voltages = 1,
},
- .fixed_uV = 1360000,
.update_bank = 0x04,
.update_reg = 0x08,
.update_mask = 0x0c,
@@ -355,7 +354,6 @@ static struct ab8500_ext_regulator_info
.owner = THIS_MODULE,
.n_voltages = 1,
},
- .fixed_uV = 3400000,
.update_bank = 0x04,
.update_reg = 0x08,
.update_mask = 0x30,
@@ -417,17 +415,14 @@ int ab8500_ext_regulator_init(struct platform_device
*pdev)
pdata->ext_regulator[i].driver_data;
if (is_ab9540(ab8500)) {
- if (info->desc.id == AB8500_EXT_SUPPLY1) {
+ if (info->desc.id == AB8500_EXT_SUPPLY1)
info->desc.ops = &ab9540_ext_regulator_ops;
- info->fixed_uV = 4500000;
- }
- if (info->desc.id == AB8500_EXT_SUPPLY2)
- info->desc.ops = &ab9540_ext_regulator_ops;
-
- if (info->desc.id == AB8500_EXT_SUPPLY3) {
+ if (info->desc.id == AB8500_EXT_SUPPLY2) {
info->desc.ops = &ab9540_ext_regulator_ops;
- info->fixed_uV = 3300000;
+ info->desc.n_voltages = 0;
}
+ if (info->desc.id == AB8500_EXT_SUPPLY3)
+ info->desc.ops = &ab9540_ext_regulator_ops;
}
/* register regulator with framework */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
