regulator: arizona-micsupp: Convert to use linear ranges
PATCH v2 1/2 regulator: arizona-micsupp: Convert to use linear ranges
Signed-off-by Charles Keepax <[email protected]>
--- drivers/regulator/arizona-micsupp.c | 52 +++++++--------------------------- 1 files changed, 11 insertions(+), 41 deletions(-)
drivers/regulator/arizona-micsupp.c +11 -41
@@ -28,8 +28,6 @@#include <linux/mfd/arizona/pdata.h> #include <linux/mfd/arizona/registers.h> -#define ARIZONA_MICSUPP_MAX_SELECTOR 0x1f -struct arizona_micsupp {struct regulator_dev *regulator;struct arizona *arizona;
@@ -40,42 +38,6 @@ struct arizona_micsupp {struct work_struct check_cp_work; }; -static int arizona_micsupp_list_voltage (struct regulator_dev *rdev, -unsigned int selector) -{ -if (selector >ARIZONA_MICSUPP_MAX_SELECTOR ) -return -EINVAL ; - -if (selector ==ARIZONA_MICSUPP_MAX_SELECTOR ) -return 3300000 ; -else -return (selector *50000 ) +1700000 ; -} - -static int arizona_micsupp_map_voltage (struct regulator_dev *rdev, -int min_uV,int max_uV) -{ -unsigned int voltage; -int selector; - -if (min_uV <1700000 ) - min_uV =1700000 ; - -if (min_uV >3200000 ) - selector =ARIZONA_MICSUPP_MAX_SELECTOR ; -else - selector =DIV_ROUND_UP (min_uV -1700000 ,50000 ); - -if (selector <0 ) -return -EINVAL ; - - voltage =arizona_micsupp_list_voltage (rdev, selector); -if (voltage < min_uV || voltage > max_uV) -return -EINVAL ; - -return selector; -} -static void arizona_micsupp_check_cp (struct work_struct *work) { struct arizona_micsupp *micsupp =
@@ -145,8 +107,8 @@ static struct regulator_ops arizona_micsupp_ops = { .disable = arizona_micsupp_disable, .is_enabled = regulator_is_enabled_regmap, - .list_voltage = arizona_micsupp_list_voltage, - .map_voltage = arizona_micsupp_map_voltage, + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, .get_voltage_sel = regulator_get_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
@@ -155,11 +117,16 @@ static struct regulator_ops arizona_micsupp_ops = { .set_bypass = arizona_micsupp_set_bypass, }; +static const struct regulator_linear_range arizona_micsupp_ranges[] = { +REGULATOR_LINEAR_RANGE (1700000 ,0 ,0x1e ,50000 ), +REGULATOR_LINEAR_RANGE (3300000 ,0x1f ,0x1f ,0 ), +}; +static const struct regulator_desc arizona_micsupp = { .name ="MICVDD" , .supply_name ="CPVDD" , .type =REGULATOR_VOLTAGE , - .n_voltages =ARIZONA_MICSUPP_MAX_SELECTOR +1 , + .n_voltages =32 , .ops = &arizona_micsupp_ops, .vsel_reg =ARIZONA_LDO2_CONTROL_1 ,
@@ -169,6 +136,9 @@ static const struct regulator_desc arizona_micsupp = { .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1, .bypass_mask = ARIZONA_CPMIC_BYPASS, + .linear_ranges = arizona_micsupp_ranges, + .n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ranges), + .enable_time = 3000, .owner = THIS_MODULE,
Signature · 1 line
1.7.2.5
PATCH v2 2/2 regulator: arizona-micsupp: Correct wm5110 voltage selection
wm5110 provides different voltage configurations than the other Arizona parts, this patch adds support for this into the regulator driver. Also fixup the default for the configuration register for wm5110.
Signed-off-by Charles Keepax <[email protected]>
--- drivers/regulator/arizona-micsupp.c | 54 +++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 2 deletions(-)
drivers/regulator/arizona-micsupp.c +52 -2
@@ -144,6 +144,33 @@ static const struct regulator_desc arizona_micsupp = { .owner = THIS_MODULE, }; +static const struct regulator_linear_range arizona_micsupp_ext_ranges[] = { +REGULATOR_LINEAR_RANGE (900000 ,0 ,0x14 ,25000 ), +REGULATOR_LINEAR_RANGE (1500000 ,0x15 ,0x27 ,100000 ), +}; + +static const struct regulator_desc arizona_micsupp_ext = { + .name ="MICVDD" , + .supply_name ="CPVDD" , + .type =REGULATOR_VOLTAGE , + .n_voltages =40 , + .ops = &arizona_micsupp_ops, + + .vsel_reg =ARIZONA_LDO2_CONTROL_1 , + .vsel_mask =ARIZONA_LDO2_VSEL_MASK , + .enable_reg =ARIZONA_MIC_CHARGE_PUMP_1 , + .enable_mask =ARIZONA_CPMIC_ENA , + .bypass_reg =ARIZONA_MIC_CHARGE_PUMP_1 , + .bypass_mask =ARIZONA_CPMIC_BYPASS , + + .linear_ranges = arizona_micsupp_ext_ranges, + .n_linear_ranges =ARRAY_SIZE (arizona_micsupp_ext_ranges), + + .enable_time =3000 , + + .owner =THIS_MODULE , +}; +static const struct regulator_init_data arizona_micsupp_default = { .constraints = { .valid_ops_mask = REGULATOR_CHANGE_STATUS |
@@ -156,9 +183,22 @@ static const struct regulator_init_data arizona_micsupp_default = { .num_consumer_supplies = 1, }; +static const struct regulator_init_data arizona_micsupp_ext_default = { + .constraints = { + .valid_ops_mask =REGULATOR_CHANGE_STATUS | +REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_BYPASS , + .min_uV =900000 , + .max_uV =3300000 , + }, + + .num_consumer_supplies =1 , +}; +static int arizona_micsupp_probe (struct platform_device *pdev) {struct arizona *arizona =dev_get_drvdata (pdev->dev.parent); +const struct regulator_desc *desc;struct regulator_config config = { };struct arizona_micsupp *micsupp;int ret;
@@ -177,7 +217,17 @@ static int arizona_micsupp_probe(struct platform_device *pdev)* default init_data for it. This will be overridden with * platform data if provided. */ - micsupp->init_data = arizona_micsupp_default; +switch (arizona->type) { +case WM5110 : + desc = &arizona_micsupp_ext; + micsupp->init_data = arizona_micsupp_ext_default; +break ; +default : + desc = &arizona_micsupp; + micsupp->init_data = arizona_micsupp_default; +break ; + } + micsupp->init_data.consumer_supplies = &micsupp->supply; micsupp->supply.supply ="MICVDD" ; micsupp->supply.dev_name =dev_name (arizona->dev);
@@ -196,7 +246,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev) ARIZONA_CPMIC_BYPASS, 0); micsupp->regulator =devm_regulator_register (&pdev->dev, - &arizona_micsupp, + desc, &config);if (IS_ERR (micsupp->regulator)) { ret =PTR_ERR (micsupp->regulator);
Signature · 1 line
1.7.2.5
Re: [PATCH v2 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection
Quoted 3 lines · Charles Keepax
wm5110 provides different voltage configurations than the other Arizona parts, this patch adds support for this into the regulator driver. Also fixup the default for the configuration register for wm5110.
Applied, thanks.