regulator: arizona-micsupp: Convert to use linear ranges
Subsystems (3)
PATCH 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 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/mfd/wm5110-tables.c | 2 +- drivers/regulator/arizona-micsupp.c | 54 +++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-)
drivers/mfd/wm5110-tables.c +1 -1
@@ -498,7 +498,7 @@ static const struct reg_default wm5110_reg_default[] = { { 0x000001AA, 0x0004 }, /* R426 - FLL2 GPIO Clock */ { 0x00000200, 0x0006 }, /* R512 - Mic Charge Pump 1 */ { 0x00000210, 0x0184 }, /* R528 - LDO1 Control 1 */ - { 0x00000213, 0x0344 }, /* R531 - LDO2 Control 1 */ + { 0x00000213, 0x03E4 }, /* R531 - LDO2 Control 1 */ { 0x00000218, 0x01A6 }, /* R536 - Mic Bias Ctrl 1 */ { 0x00000219, 0x01A6 }, /* R537 - Mic Bias Ctrl 2 */ { 0x0000021A, 0x01A6 }, /* R538 - Mic Bias Ctrl 3 */
drivers/regulator/arizona-micsupp.c +52 -2
81 lines not on this page · raw message
Signature · 1 line
1.7.2.5
Mark Brown
maintainerRe: [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection
Quoted 1 line · Charles Keepax
drivers/mfd/wm5110-tables.c | 2 +-
Send the MFD change separately, there's no code dependency. Please also remember to CC all the maintainers for subsystems.
Quoted 1 line · Charles Keepax
Signed-off-by Charles Keepax <[email protected]>
Applied, thanks.