regulator: Implement list_voltage() for WM8400 DCDCs and LDOs
PATCH 1/2 regulator: Implement list_voltage() for WM8400 DCDCs and LDOs
All DCDCs and LDOs are identical.
--- drivers/regulator/wm8400-regulator.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-)
drivers/regulator/wm8400-regulator.c +30 -4
@@ -43,6 +43,18 @@ static int wm8400_ldo_disable(struct regulator_dev *dev) WM8400_LDO1_ENA, 0); } +static int wm8400_ldo_list_voltage (struct regulator_dev *dev, +unsigned selector) +{ +if (selector >WM8400_LDO1_VSEL_MASK ) +return -EINVAL ; + +if (selector <15 ) +return 900000 + (selector *50000 ); +else +return 1600000 + ((selector -14 ) *100000 ); +} +static int wm8400_ldo_get_voltage (struct regulator_dev *dev) {struct wm8400 *wm8400 =rdev_get_drvdata (dev);
@@ -51,10 +63,7 @@ static int wm8400_ldo_get_voltage(struct regulator_dev *dev) val =wm8400_reg_read (wm8400,WM8400_LDO1_CONTROL +rdev_get_id (dev)); val &=WM8400_LDO1_VSEL_MASK ; -if (val <15 ) -return 900000 + (val *50000 ); -else -return 1600000 + ((val -14 ) *100000 ); +return wm8400_ldo_list_voltage (dev, val); } static int wm8400_ldo_set_voltage(struct regulator_dev *dev,
@@ -92,6 +101,7 @@ static struct regulator_ops wm8400_ldo_ops = { .is_enabled = wm8400_ldo_is_enabled, .enable = wm8400_ldo_enable, .disable = wm8400_ldo_disable, + .list_voltage = wm8400_ldo_list_voltage, .get_voltage = wm8400_ldo_get_voltage, .set_voltage = wm8400_ldo_set_voltage, };
@@ -124,6 +134,15 @@ static int wm8400_dcdc_disable(struct regulator_dev *dev) WM8400_DC1_ENA, 0); } +static int wm8400_dcdc_list_voltage (struct regulator_dev *dev, +unsigned selector) +{ +if (selector >WM8400_DC1_VSEL_MASK ) +return -EINVAL ; + +return 850000 + (selector *25000 ); +} +static int wm8400_dcdc_get_voltage (struct regulator_dev *dev) {struct wm8400 *wm8400 =rdev_get_drvdata (dev);
@@ -237,6 +256,7 @@ static struct regulator_ops wm8400_dcdc_ops = { .is_enabled = wm8400_dcdc_is_enabled, .enable = wm8400_dcdc_enable, .disable = wm8400_dcdc_disable, + .list_voltage = wm8400_dcdc_list_voltage, .get_voltage = wm8400_dcdc_get_voltage, .set_voltage = wm8400_dcdc_set_voltage, .get_mode = wm8400_dcdc_get_mode,
@@ -249,6 +269,7 @@ static struct regulator_desc regulators[] = { .name = "LDO1", .id = WM8400_LDO1, .ops = &wm8400_ldo_ops, + .n_voltages = WM8400_LDO1_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
@@ -256,6 +277,7 @@ static struct regulator_desc regulators[] = { .name = "LDO2", .id = WM8400_LDO2, .ops = &wm8400_ldo_ops, + .n_voltages = WM8400_LDO2_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
@@ -263,6 +285,7 @@ static struct regulator_desc regulators[] = { .name = "LDO3", .id = WM8400_LDO3, .ops = &wm8400_ldo_ops, + .n_voltages = WM8400_LDO3_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
@@ -270,6 +293,7 @@ static struct regulator_desc regulators[] = { .name = "LDO4", .id = WM8400_LDO4, .ops = &wm8400_ldo_ops, + .n_voltages = WM8400_LDO4_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
@@ -277,6 +301,7 @@ static struct regulator_desc regulators[] = { .name = "DCDC1", .id = WM8400_DCDC1, .ops = &wm8400_dcdc_ops, + .n_voltages = WM8400_DC1_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
@@ -284,6 +309,7 @@ static struct regulator_desc regulators[] = { .name = "DCDC2", .id = WM8400_DCDC2, .ops = &wm8400_dcdc_ops, + .n_voltages = WM8400_DC2_VSEL_MASK + 1, .type = REGULATOR_VOLTAGE, .owner = THIS_MODULE, },
Signature · 1 line
1.6.2
PATCH 2/2 regulator: Don't warn on omitted voltage constraints
Specifying voltage constraints is optional (and only needed if the consumer is allowed to change the voltage) so don't complain unless a voltage has been specified.
Also avoid surprises with a dangling else while we're here.
--- drivers/regulator/core.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/regulator/core.c +5 -1
@@ -709,8 +709,12 @@ static int set_machine_constraints(struct regulator_dev *rdev, cmax =INT_MAX ; } +/* voltage constraints are optional */ +if ((cmin ==0 ) && (cmax ==0 )) + goto out; +/* else require explicit machine-level constraints */ -else if (cmin <=0 || cmax <=0 || cmax < cmin) { +if (cmin <=0 || cmax <=0 || cmax < cmin) {pr_err ("%s: %s '%s' voltage constraints\n" , __func__,"invalid" , name); ret = -EINVAL ;
Signature · 1 line
1.6.2
Liam Girdwood
AppliedRe: [PATCH 2/2] regulator: Don't warn on omitted voltage constraints
Quoted 10 lines · Mark Brown
Specifying voltage constraints is optional (and only needed if the consumer is allowed to change the voltage) so don't complain unless a voltage has been specified.
Also avoid surprises with a dangling else while we're here.
Signed-off-by Mark Brown <[email protected]>--- drivers/regulator/core.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Applied.
Thanks
Liam
Liam Girdwood
AppliedQuoted 4 lines · Mark Brown
All DCDCs and LDOs are identical.
Signed-off-by Mark Brown <[email protected]>---
Applied.
Thanks
Liam