* [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges @ 2013-11-15 13:13 Charles Keepax 2013-11-15 13:13 ` [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection Charles Keepax 2013-11-15 13:55 ` [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Mark Brown 0 siblings, 2 replies; 4+ messages in thread From: Charles Keepax @ 2013-11-15 13:13 UTC (permalink / raw) To: broonie; +Cc: lgirdwood, lee.jones, patches, linux-kernel, Charles Keepax Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- drivers/regulator/arizona-micsupp.c | 52 +++++++--------------------------- 1 files changed, 11 insertions(+), 41 deletions(-) diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index 724706a..3c75bf8 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c @@ -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, -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection 2013-11-15 13:13 [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Charles Keepax @ 2013-11-15 13:13 ` Charles Keepax 2013-11-15 13:42 ` Mark Brown 2013-11-15 13:55 ` [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Mark Brown 1 sibling, 1 reply; 4+ messages in thread From: Charles Keepax @ 2013-11-15 13:13 UTC (permalink / raw) To: broonie; +Cc: lgirdwood, lee.jones, patches, linux-kernel, 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. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- drivers/mfd/wm5110-tables.c | 2 +- drivers/regulator/arizona-micsupp.c | 54 +++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c index 3113e39..daf2fe8 100644 --- a/drivers/mfd/wm5110-tables.c +++ b/drivers/mfd/wm5110-tables.c @@ -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 */ diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index 3c75bf8..034ece7 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c @@ -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); -- 1.7.2.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection 2013-11-15 13:13 ` [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection Charles Keepax @ 2013-11-15 13:42 ` Mark Brown 0 siblings, 0 replies; 4+ messages in thread From: Mark Brown @ 2013-11-15 13:42 UTC (permalink / raw) To: Charles Keepax; +Cc: lgirdwood, lee.jones, patches, linux-kernel [-- Attachment #1: Type: text/plain, Size: 239 bytes --] On Fri, Nov 15, 2013 at 01:13:33PM +0000, Charles Keepax wrote: > 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. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges 2013-11-15 13:13 [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Charles Keepax 2013-11-15 13:13 ` [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection Charles Keepax @ 2013-11-15 13:55 ` Mark Brown 1 sibling, 0 replies; 4+ messages in thread From: Mark Brown @ 2013-11-15 13:55 UTC (permalink / raw) To: Charles Keepax; +Cc: lgirdwood, lee.jones, patches, linux-kernel [-- Attachment #1: Type: text/plain, Size: 152 bytes --] On Fri, Nov 15, 2013 at 01:13:32PM +0000, Charles Keepax wrote: > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Applied, thanks. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-15 13:56 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-15 13:13 [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Charles Keepax 2013-11-15 13:13 ` [PATCH 2/2] regulator: arizona-micsupp: Correct wm5110 voltage selection Charles Keepax 2013-11-15 13:42 ` Mark Brown 2013-11-15 13:55 ` [PATCH 1/2] regulator: arizona-micsupp: Convert to use linear ranges Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.