regulator: da9121: extend support to variants, add features
v2 cover regulator: da9121: extend support to variants, add features
This series extends the DA9121 driver to add support for related products:
DA9130, 10A, Dual-Phase (Automotive Grade)
DA9122, 5A + 5A
DA9131, 5A + 5A (Automotive Grade)
DA9220, 3A + 3A
DA9132, 3A + 3A (Automotive Grade)
DA9217, 6A, Dual-Phase
It also extends support to cover DT configured GPIO enable, current limit setting, and interrupt handling for all devices.
The datasheets are currently available here:
https://www.dialog-semiconductor.com/sites/default/files/da9122_datasheet_2v1.pdf
https://www.dialog-semiconductor.com/sites/default/files/da9220_datasheet_2v1.pdf
https://www.dialog-semiconductor.com/sites/default/files/da9217_datasheet_2v1.pdf
https://www.dialog-semiconductor.com/sites/default/files/da9130-a_datasheet_1v0.pdf
https://www.dialog-semiconductor.com/sites/default/files/da9131-a_datasheet_1v0.pdf
https://www.dialog-semiconductor.com/sites/default/files/da9132-a_datasheet_1v0.pdf
V2:
- Remove Vincent Whitchurch as DT maintainer, as requested
- Use configuration to select register map
- Split regmap and description patch
- Defer device ID check to negate, not gatekeep
- Removed superfluous compatible check
- Tidied banner comment
- Switched to using of_parse_cb()
- Simplified buck checks accordingly
- Simplified current/mode register/mask use
- Simplified interrupt handling
- Synchronise workqueue at driver exit
Adam Ward (9):
regulator: da9121: Add header file
regulator: da9121: Add device variants
regulator: da9121: Add device variant regmaps
regulator: da9121: Add device variant descriptors
regulator: da9121: Add support for device variants via devicetree
regulator: da9121: Update registration to support multiple buck
variants
regulator: da9121: add current support
regulator: da9121: add mode support
regulator: da9121: add interrupt support
drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 1033 ++++++++++++++++++++++++++++++++-- drivers/regulator/da9121-regulator.h | 291 ++++++++++ include/linux/regulator/da9121.h | 36 ++ 4 files changed, 1336 insertions(+), 38 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h create mode 100644 include/linux/regulator/da9121.h
Signature · 1 line
1.9.1
PATCH v2 1/9 regulator: da9121: Add header file
Add header file for Dialog Semiconductor DA9121 regulator and related devices, mostly autogenerated from the chip design databases, and update driver to replace local defines with those from header.
--- drivers/regulator/da9121-regulator.c | 15 +- drivers/regulator/da9121-regulator.h | 291 +++++++++++++++++++++++++++++++++++ 2 files changed, 296 insertions(+), 10 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h
drivers/regulator/da9121-regulator.c +5 -10
@@ -9,12 +9,7 @@#include <linux/regmap.h> #include <linux/err.h> #include <linux/i2c.h> - -#define DA9121_BUCK_BUCK1_0 0x20 -#define DA9121_BUCK_BUCK1_0_CH1_EN BIT(0) - -#define DA9121_BUCK_BUCK1_5 0x25 -#define DA9121_BUCK_BUCK1_5_CH1_A_VOUT GENMASK(7, 0) +#include "da9121-regulator.h" #define DA9121_MIN_MV 300#define DA9121_MAX_MV 1900
@@ -47,10 +42,10 @@ .min_uV = DA9121_MIN_MV * 1000, .uV_step = DA9121_STEP_MV * 1000, .linear_min_sel = DA9121_MIN_SEL, - .vsel_reg = DA9121_BUCK_BUCK1_5, - .vsel_mask = DA9121_BUCK_BUCK1_5_CH1_A_VOUT, - .enable_reg = DA9121_BUCK_BUCK1_0, - .enable_mask = DA9121_BUCK_BUCK1_0_CH1_EN, + .vsel_reg = DA9121_REG_BUCK_BUCK1_5, + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + .enable_reg = DA9121_REG_BUCK_BUCK1_0, + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN,/* Default value of BUCK_BUCK1_0.CH1_SRC_DVC_UP */ .ramp_delay = 20000,/* tBUCK_EN */
drivers/regulator/da9121-regulator.h new file +291 -0
291 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 2/9 regulator: da9121: Add device variants
In reply to Adam WardAdd basic support for configuration to reference variants of this device, and track the selected variant within the driver.
--- drivers/regulator/da9121-regulator.c | 46 +++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-)
drivers/regulator/da9121-regulator.c +43 -3
@@ -11,6 +11,12 @@#include <linux/i2c.h> #include "da9121-regulator.h" +/* Chip data */ +struct da9121 { +struct device *dev; +int variant_id; +}; +#define DA9121_MIN_MV 300#define DA9121_MAX_MV 1900#define DA9121_STEP_MV 10
@@ -53,19 +59,46 @@ };static const struct of_device_id da9121_dt_ids[] = { - { .compatible ="dlg,da9121" , }, + { .compatible ="dlg,da9121" , .data = (void *)DA9121_TYPE_DA9121_DA9130 }, + { .compatible ="dlg,da9130" , .data = (void *)DA9121_TYPE_DA9121_DA9130 }, + { .compatible ="dlg,da9217" , .data = (void *)DA9121_TYPE_DA9217 }, + { .compatible ="dlg,da9122" , .data = (void *)DA9121_TYPE_DA9122_DA9131 }, + { .compatible ="dlg,da9131" , .data = (void *)DA9121_TYPE_DA9122_DA9131 }, + { .compatible ="dlg,da9220" , .data = (void *)DA9121_TYPE_DA9220_DA9132 }, + { .compatible ="dlg,da9132" , .data = (void *)DA9121_TYPE_DA9220_DA9132 }, { } };MODULE_DEVICE_TABLE (of, da9121_dt_ids); +static inline int da9121_of_get_id (struct device *dev) +{ +const struct of_device_id *id =of_match_device (da9121_dt_ids, dev); + +if (!id) { +dev_err (dev,"%s: Failed\n" , __func__); +return -EINVAL ; + } +return (uintptr_t )id->data; +} +static int da9121_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { +struct da9121 *chip; +int ret =0 ;struct device *dev = &i2c->dev;struct regulator_config config = {};struct regulator_dev *rdev;struct regmap *regmap; + chip =devm_kzalloc (&i2c->dev,sizeof (struct da9121 ),GFP_KERNEL ); +if (!chip) { + ret = -ENOMEM ; + goto error; + } + + chip->variant_id =da9121_of_get_id (&i2c->dev); + regmap =devm_regmap_init_i2c (i2c, &da9121_regmap_config);if (IS_ERR (regmap))return PTR_ERR (regmap);
@@ -80,11 +113,18 @@ static int da9121_i2c_probe(struct i2c_client *i2c,return PTR_ERR (rdev); } -return 0 ; +error: +return ret; }static const struct i2c_device_id da9121_i2c_id[] = { - {"da9121" ,0 }, + {"da9121" ,DA9121_TYPE_DA9121_DA9130 }, + {"da9130" ,DA9121_TYPE_DA9121_DA9130 }, + {"da9217" ,DA9121_TYPE_DA9217 }, + {"da9122" ,DA9121_TYPE_DA9122_DA9131 }, + {"da9131" ,DA9121_TYPE_DA9122_DA9131 }, + {"da9220" ,DA9121_TYPE_DA9220_DA9132 }, + {"da9132" ,DA9121_TYPE_DA9220_DA9132 }, {}, };MODULE_DEVICE_TABLE (i2c, da9121_i2c_id);
Signature · 1 line
1.9.1
PATCH v2 4/9 regulator: da9121: Add device variant descriptors
In reply to Adam WardDescriptors for bucks in all variants, ready for of_regulator_match
--- drivers/regulator/da9121-regulator.c | 110 +++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+)
drivers/regulator/da9121-regulator.c +110 -0
@@ -41,6 +41,11 @@ struct da9121 { .list_voltage = regulator_list_voltage_linear, }; +static struct of_regulator_match da9121_matches[] = { + [DA9121_IDX_BUCK1 ] = { .name ="buck1" }, + [DA9121_IDX_BUCK2 ] = { .name ="buck2" }, +}; +#define DA9121_MIN_MV 300#define DA9121_MAX_MV 1900#define DA9121_STEP_MV 10
@@ -49,9 +54,11 @@ struct da9121 { + 1 + DA9121_MIN_SEL)static const struct regulator_desc da9121_reg = { + .id =DA9121_IDX_BUCK1 , .name ="da9121" , .of_match ="buck1" , .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), .ops = &da9121_buck_ops, .type =REGULATOR_VOLTAGE , .n_voltages =DA9121_N_VOLTAGES ,
@@ -68,6 +75,105 @@ struct da9121 { .enable_time = 20, }; +static const struct regulator_desc da9220_reg[2 ] = { + { + .id =DA9121_IDX_BUCK1 , + .name ="DA9220/DA9132 BUCK1" , + .of_match ="buck1" , + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA9121_N_VOLTAGES , + .min_uV =DA9121_MIN_MV *1000 , + .uV_step =DA9121_STEP_MV *1000 , + .linear_min_sel =DA9121_MIN_SEL , + .enable_reg =DA9121_REG_BUCK_BUCK1_0 , + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg =DA9121_REG_BUCK_BUCK1_5 , + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + }, + { + .id =DA9121_IDX_BUCK2 , + .name ="DA9220/DA9132 BUCK2" , + .of_match ="buck2" , + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA9121_N_VOLTAGES , + .min_uV =DA9121_MIN_MV *1000 , + .uV_step =DA9121_STEP_MV *1000 , + .linear_min_sel =DA9121_MIN_SEL , + .enable_reg = DA9xxx_REG_BUCK_BUCK2_0, + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg = DA9xxx_REG_BUCK_BUCK2_5, + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + } +}; + +static const struct regulator_desc da9122_reg[2 ] = { + { + .id =DA9121_IDX_BUCK1 , + .name ="DA9122/DA9131 BUCK1" , + .of_match ="buck1" , + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA9121_N_VOLTAGES , + .min_uV =DA9121_MIN_MV *1000 , + .uV_step =DA9121_STEP_MV *1000 , + .linear_min_sel =DA9121_MIN_SEL , + .enable_reg =DA9121_REG_BUCK_BUCK1_0 , + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg =DA9121_REG_BUCK_BUCK1_5 , + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + }, + { + .id =DA9121_IDX_BUCK2 , + .name ="DA9122/DA9131 BUCK2" , + .of_match ="buck2" , + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA9121_N_VOLTAGES , + .min_uV =DA9121_MIN_MV *1000 , + .uV_step =DA9121_STEP_MV *1000 , + .linear_min_sel =DA9121_MIN_SEL , + .enable_reg = DA9xxx_REG_BUCK_BUCK2_0, + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg = DA9xxx_REG_BUCK_BUCK2_5, + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + } +}; + +static const struct regulator_desc da9217_reg = { + .id =DA9121_IDX_BUCK1 , + .name ="DA9217 BUCK1" , + .of_match ="buck1" , + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA9121_N_VOLTAGES , + .min_uV =DA9121_MIN_MV *1000 , + .uV_step =DA9121_STEP_MV *1000 , + .linear_min_sel =DA9121_MIN_SEL , + .enable_reg =DA9121_REG_BUCK_BUCK1_0 , + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg =DA9121_REG_BUCK_BUCK1_5 , + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, +}; + +static const struct regulator_desc *local_da9121_regulators[][DA9121_IDX_MAX ] = { + [DA9121_TYPE_DA9121_DA9130 ] = { &da9121_reg,NULL }, + [DA9121_TYPE_DA9220_DA9132 ] = { &da9220_reg[0 ], &da9220_reg[1 ] }, + [DA9121_TYPE_DA9122_DA9131 ] = { &da9122_reg[0 ], &da9122_reg[1 ] }, + [DA9121_TYPE_DA9217 ] = { &da9217_reg,NULL }, +}; +/* DA9121 chip register model */ static const struct regmap_range da9121_1ch_readable_ranges[] = {regmap_reg_range (DA9121_REG_SYS_STATUS_0 ,DA9121_REG_SYS_MASK_3 ),
@@ -255,6 +361,10 @@ static int da9121_assign_chip_model(struct i2c_client *i2c,break ; } +/* Set these up for of_regulator_match call which may want .of_map_modes */ + da9121_matches[0 ].desc = local_da9121_regulators[chip->variant_id][0 ]; + da9121_matches[1 ].desc = local_da9121_regulators[chip->variant_id][1 ]; + chip->regmap =devm_regmap_init_i2c (i2c, regmap);if (IS_ERR (chip->regmap)) { ret =PTR_ERR (chip->regmap);
Signature · 1 line
1.9.1
PATCH v2 3/9 regulator: da9121: Add device variant regmaps
In reply to Adam WardAdd ability to probe device and validate configuration, then apply a regmap configuration for a single or dual buck device accordingly.
--- drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 244 ++++++++++++++++++++++++++++++++--- include/linux/regulator/da9121.h | 25 ++++ 3 files changed, 262 insertions(+), 21 deletions(-) create mode 100644 include/linux/regulator/da9121.h
drivers/regulator/Kconfig +11 -3
@@ -313,13 +313,21 @@ config REGULATOR_DA9063 will be called da9063-regulator. config REGULATOR_DA9121 - tristate "Dialog Semiconductor DA9121 regulator" + tristate "Dialog Semiconductor DA9121/DA9122/DA9220/DA9217/DA9130/DA9131/DA9132 regulator" depends on I2C && OF select REGMAP_I2C help Say y here to support for the Dialog Semiconductor DA9121. The - DA9210 is a dual-phase buck converter controlled through an I2C - interface. + DA9121 is a single channel dual-phase buck converter controlled + through an I2C interface. + + DA9121 Single-channel dual-phase 10A buck converter + DA9130 Single-channel dual-phase 10A buck converter (Automotive) + DA9217 Single-channel dual-phase 6A buck converter + DA9122 Dual-channel single-phase 5A buck converter + DA9131 Dual-channel single-phase 5A buck converter (Automotive) + DA9220 Dual-channel single-phase 3A buck converter + DA9132 Dual-channel single-phase 3A buck converter (Automotive) This driver can also be built as a module. If so, the module will be called da9121-regulator.
drivers/regulator/da9121-regulator.c +226 -18
289 lines not on this page · raw message
include/linux/regulator/da9121.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* DA9121 Single-channel dual-phase 10A buck converter +* DA9130 Single-channel dual-phase 10A buck converter (Automotive) +* DA9217 Single-channel dual-phase 6A buck converter +* DA9122 Dual-channel single-phase 5A buck converter +* DA9131 Dual-channel single-phase 5A buck converter (Automotive) +* DA9220 Dual-channel single-phase 3A buck converter +* DA9132 Dual-channel single-phase 3A buck converter (Automotive) +* +* Copyright (C) 2020 Dialog Semiconductor +* +* Authors: Adam Ward, Dialog Semiconductor +*/ + +#ifndef __LINUX_REGULATOR_DA9121_H +#define __LINUX_REGULATOR_DA9121_H + +enum { +DA9121_IDX_BUCK1 , +DA9121_IDX_BUCK2 , +DA9121_IDX_MAX +}; + +#endif
Signature · 1 line
1.9.1
PATCH v2 5/9 regulator: da9121: Add support for device variants via devicetree
In reply to Adam WardAdd devicetree configuration and device variant parameters. Use the latter to enable the check and use of parameters specific to dual buck variants.
--- drivers/regulator/da9121-regulator.c | 119 +++++++++++++++++++++++++++++++++++ include/linux/regulator/da9121.h | 11 ++++ 2 files changed, 130 insertions(+)
drivers/regulator/da9121-regulator.c +119 -0
@@ -14,6 +14,7 @@// Copyright (C) 2020 Dialog Semiconductor #include <linux/of_device.h> +#include <linux/of_gpio.h> #include <linux/regulator/of_regulator.h> #include <linux/regulator/machine.h> #include <linux/regulator/driver.h>
@@ -28,10 +29,67 @@/* Chip data */ struct da9121 {struct device *dev; +struct da9121_pdata *pdata;struct regmap *regmap;int variant_id; }; +/* Define ranges for different variants, enabling translation to/from +* registers. Maximums give scope to allow for transients. +*/ +struct da9121_range { +int val_min; +int val_max; +int val_stp; +int reg_min; +int reg_max; +}; + +struct da9121_range da9121_10A_2phase_current = { + .val_min =7000000 , + .val_max =20000000 , + .val_stp =1000000 , + .reg_min =1 , + .reg_max =14 , +}; + +struct da9121_range da9121_6A_2phase_current = { + .val_min =7000000 , + .val_max =12000000 , + .val_stp =1000000 , + .reg_min =1 , + .reg_max =6 , +}; + +struct da9121_range da9121_5A_1phase_current = { + .val_min =3500000 , + .val_max =10000000 , + .val_stp =500000 , + .reg_min =1 , + .reg_max =14 , +}; + +struct da9121_range da9121_3A_1phase_current = { + .val_min =3500000 , + .val_max =6000000 , + .val_stp =500000 , + .reg_min =1 , + .reg_max =6 , +}; + +struct da9121_variant_info { +int num_bucks; +int num_phases; +struct da9121_range *current_range; +}; + +static const struct da9121_variant_info variant_parameters[] = { + {1 ,2 , &da9121_10A_2phase_current },//DA9121_TYPE_DA9121_DA9130 + {2 ,1 , &da9121_3A_1phase_current },//DA9121_TYPE_DA9220_DA9132 + {2 ,1 , &da9121_5A_1phase_current },//DA9121_TYPE_DA9122_DA9131 + {1 ,2 , &da9121_6A_2phase_current },//DA9121_TYPE_DA9217 +}; +static const struct regulator_ops da9121_buck_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap,
@@ -46,6 +104,59 @@ struct da9121 { [DA9121_IDX_BUCK2] = { .name = "buck2" }, }; +static int da9121_of_parse_cb (struct device_node *np, +const struct regulator_desc *desc, +struct regulator_config *config) +{ +struct da9121 *chip = config->driver_data; +struct da9121_pdata *pdata; +struct gpio_desc *ena_gpiod; + +if (chip->pdata ==NULL ) { + pdata =devm_kzalloc (chip->dev,sizeof (*pdata),GFP_KERNEL ); +if (!pdata) +return -ENOMEM ; + }else { + pdata = chip->pdata; + } + + pdata->num_buck++; + +if (pdata->num_buck > variant_parameters[chip->variant_id].num_bucks) { +dev_err (chip->dev,"Error: excessive regulators for device\n" ); +return -ENODEV ; + } + + ena_gpiod =fwnode_gpiod_get_index (of_fwnode_handle (np),"enable" ,0 , +GPIOD_OUT_HIGH | +GPIOD_FLAGS_BIT_NONEXCLUSIVE , +"da9121-enable" ); +if (!IS_ERR (ena_gpiod)) + config->ena_gpiod = ena_gpiod; + +if (variant_parameters[chip->variant_id].num_bucks ==2 ) { +uint32_t ripple_cancel; +uint32_t ripple_reg; +int ret; + +if (of_property_read_u32 (da9121_matches[pdata->num_buck].of_node, +"dlg,ripple-cancel" , &ripple_cancel)) { +if (pdata->num_buck >1 ) + ripple_reg = DA9xxx_REG_BUCK_BUCK2_7; +else + ripple_reg =DA9121_REG_BUCK_BUCK1_7 ; + + ret =regmap_update_bits (chip->regmap, ripple_reg, + DA9xxx_MASK_BUCK_BUCKx_7_CHx_RIPPLE_CANCEL, + ripple_cancel); +if (ret <0 ) +dev_err (chip->dev,"Cannot set ripple mode, err: %d\n" , ret); + } + } + +return 0 ; +} +#define DA9121_MIN_MV 300#define DA9121_MAX_MV 1900#define DA9121_STEP_MV 10
@@ -57,6 +168,7 @@ struct da9121 { .id = DA9121_IDX_BUCK1, .name = "da9121", .of_match = "buck1", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -80,6 +192,7 @@ struct da9121 { .id = DA9121_IDX_BUCK1, .name = "DA9220/DA9132 BUCK1", .of_match = "buck1", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -97,6 +210,7 @@ struct da9121 { .id = DA9121_IDX_BUCK2, .name = "DA9220/DA9132 BUCK2", .of_match = "buck2", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -117,6 +231,7 @@ struct da9121 { .id = DA9121_IDX_BUCK1, .name = "DA9122/DA9131 BUCK1", .of_match = "buck1", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -134,6 +249,7 @@ struct da9121 { .id = DA9121_IDX_BUCK2, .name = "DA9122/DA9131 BUCK2", .of_match = "buck2", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -153,6 +269,7 @@ struct da9121 { .id = DA9121_IDX_BUCK1, .name = "DA9217 BUCK1", .of_match = "buck1", + .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), .ops = &da9121_buck_ops,
@@ -415,6 +532,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c, goto error; } + chip->pdata = i2c->dev.platform_data; chip->variant_id =da9121_of_get_id (&i2c->dev); ret =da9121_assign_chip_model (i2c, chip);
@@ -422,6 +540,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c, goto error; config.dev = &i2c->dev; + config.driver_data = chip; config.of_node = dev->of_node; config.regmap = chip->regmap;
include/linux/regulator/da9121.h +11 -0
@@ -16,10 +16,21 @@#ifndef __LINUX_REGULATOR_DA9121_H#define __LINUX_REGULATOR_DA9121_H +#include <linux/regulator/machine.h> + +struct gpio_desc ; +enum {DA9121_IDX_BUCK1 ,DA9121_IDX_BUCK2 ,DA9121_IDX_MAX }; +struct da9121_pdata { +int num_buck; +struct gpio_desc *gpiod_ren[DA9121_IDX_MAX ]; +struct device_node *reg_node[DA9121_IDX_MAX ]; +struct regulator_init_data *init_data[DA9121_IDX_MAX ]; +}; +#endif
Signature · 1 line
1.9.1
PATCH v2 6/9 regulator: da9121: Update registration to support multiple buck variants
In reply to Adam WardAdd function which iterates the regulator descriptors for the confirmed variant ID and registers each buck.
--- drivers/regulator/da9121-regulator.c | 44 +++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 13 deletions(-)
drivers/regulator/da9121-regulator.c +31 -13
@@ -31,6 +31,7 @@ struct da9121 {struct device *dev;struct da9121_pdata *pdata;struct regmap *regmap; +struct regulator_dev *rdev[DA9121_IDX_MAX ];int variant_id; };
@@ -291,6 +292,35 @@ static int da9121_of_parse_cb(struct device_node *np, [DA9121_TYPE_DA9217] = { &da9217_reg, NULL }, }; +static int da9121_set_regulator_config (struct da9121 *chip) +{ +struct regulator_config config = { }; +unsigned int max_matches = variant_parameters[chip->variant_id].num_bucks; +int ret =0 ; +int i; + +for (i =0 ; i < max_matches; i++) { +const struct regulator_desc *regl_desc = + local_da9121_regulators[chip->variant_id][i]; + + config.dev = chip->dev; + config.driver_data = chip; + config.regmap = chip->regmap; + + chip->rdev[i] =devm_regulator_register (chip->dev, + regl_desc, &config); +if (IS_ERR (chip->rdev[i])) { +dev_err (chip->dev,"Failed to register regulator %s, %d/%d\n" , + regl_desc->name, (i+1 ), max_matches); + ret =PTR_ERR (chip->rdev[i]); + goto error; + } + } + +error: +return ret; +} +/* DA9121 chip register model */ static const struct regmap_range da9121_1ch_readable_ranges[] = {regmap_reg_range (DA9121_REG_SYS_STATUS_0 ,DA9121_REG_SYS_MASK_3 ),
@@ -522,9 +552,6 @@ static int da9121_i2c_probe(struct i2c_client *i2c, {struct da9121 *chip;int ret =0 ; -struct device *dev = &i2c->dev; -struct regulator_config config = {}; -struct regulator_dev *rdev; chip =devm_kzalloc (&i2c->dev,sizeof (struct da9121 ),GFP_KERNEL );if (!chip) {
@@ -539,16 +566,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c,if (ret <0 ) goto error; - config.dev = &i2c->dev; - config.driver_data = chip; - config.of_node = dev->of_node; - config.regmap = chip->regmap; - - rdev =devm_regulator_register (&i2c->dev, &da9121_reg, &config); -if (IS_ERR (rdev)) { -dev_err (&i2c->dev,"Failed to register da9121 regulator\n" ); -return PTR_ERR (rdev); - } + ret =da9121_set_regulator_config (chip); error:return ret;
Signature · 1 line
1.9.1
PATCH v2 8/9 regulator: da9121: add mode support
In reply to Adam WardAdds get/set for mode, and mapping from REGULATOR_MODE_* to select PFM/PWM/Auto operation.
--- drivers/regulator/da9121-regulator.c | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)
drivers/regulator/da9121-regulator.c +74 -0
@@ -101,6 +101,11 @@ struct da9121_field { { DA9xxx_REG_BUCK_BUCK2_2, DA9121_MASK_BUCK_BUCKx_2_CHx_ILIM }, }; +static const struct da9121_field da9121_mode_field[2 ] = { + {DA9121_REG_BUCK_BUCK1_4 , DA9121_MASK_BUCK_BUCKx_4_CHx_A_MODE }, + { DA9xxx_REG_BUCK_BUCK2_4, DA9121_MASK_BUCK_BUCKx_4_CHx_A_MODE }, +}; +static int da9121_get_current_limit (struct regulator_dev *rdev) {struct da9121 *chip =rdev_get_drvdata (rdev);
@@ -202,6 +207,67 @@ static int da9121_set_current_limit(struct regulator_dev *rdev,return ret; } +static unsigned int da9121_map_mode (unsigned int mode) +{ +switch (mode) { +case DA9121_BUCK_MODE_FORCE_PWM : +return REGULATOR_MODE_FAST ; +case DA9121_BUCK_MODE_FORCE_PWM_SHEDDING : +return REGULATOR_MODE_NORMAL ; +case DA9121_BUCK_MODE_AUTO : +return REGULATOR_MODE_IDLE ; +case DA9121_BUCK_MODE_FORCE_PFM : +return REGULATOR_MODE_STANDBY ; +default : +return -EINVAL ; + } +} + +static int da9121_buck_set_mode (struct regulator_dev *rdev,unsigned int mode) +{ +struct da9121 *chip =rdev_get_drvdata (rdev); +int id =rdev_get_id (rdev); +unsigned int val; + +switch (mode) { +case REGULATOR_MODE_FAST : + val =DA9121_BUCK_MODE_FORCE_PWM ; +break ; +case REGULATOR_MODE_NORMAL : + val =DA9121_BUCK_MODE_FORCE_PWM_SHEDDING ; +break ; +case REGULATOR_MODE_IDLE : + val =DA9121_BUCK_MODE_AUTO ; +break ; +case REGULATOR_MODE_STANDBY : + val =DA9121_BUCK_MODE_FORCE_PFM ; +break ; +default : +return -EINVAL ; + } + +return regmap_update_bits (chip->regmap, + da9121_mode_field[id].reg, + da9121_mode_field[id].msk, + val); +} + +static unsigned int da9121_buck_get_mode (struct regulator_dev *rdev) +{ +struct da9121 *chip =rdev_get_drvdata (rdev); +int id =rdev_get_id (rdev); +unsigned int val; +int ret =0 ; + + ret =regmap_read (chip->regmap, da9121_mode_field[id].reg, &val); +if (ret <0 ) { +dev_err (chip->dev,"Cannot read BUCK register: %d\n" , ret); +return -EINVAL ; + } + +return da9121_map_mode (val & da9121_mode_field[id].msk); +} +static const struct regulator_ops da9121_buck_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap,
@@ -211,6 +277,8 @@ static int da9121_set_current_limit(struct regulator_dev *rdev, .list_voltage = regulator_list_voltage_linear, .get_current_limit = da9121_get_current_limit, .set_current_limit = da9121_set_current_limit, + .set_mode = da9121_buck_set_mode, + .get_mode = da9121_buck_get_mode, };static struct of_regulator_match da9121_matches[] = {
@@ -285,6 +353,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
@@ -309,6 +378,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
@@ -327,6 +397,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
@@ -348,6 +419,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
@@ -366,6 +438,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
@@ -386,6 +459,7 @@ static int da9121_of_parse_cb(struct device_node *np, .of_parse_cb = da9121_of_parse_cb, .owner = THIS_MODULE, .regulators_node = of_match_ptr("regulators"), + .of_map_mode = da9121_map_mode, .ops = &da9121_buck_ops, .type = REGULATOR_VOLTAGE, .n_voltages = DA9121_N_VOLTAGES,
Signature · 1 line
1.9.1
PATCH v2 9/9 regulator: da9121: add interrupt support
In reply to Adam WardAdds interrupt handler for variants, and notifications for events; over temperature/voltage/current. Because the IRQs are triggered by persisting status, they must be masked and the status polled until clear, before the IRQ can be enabled again.
--- drivers/regulator/da9121-regulator.c | 286 +++++++++++++++++++++++++++++++++++ 1 file changed, 286 insertions(+)
drivers/regulator/da9121-regulator.c +286 -0
@@ -23,15 +23,21 @@#include <linux/err.h> #include <linux/i2c.h> #include <linux/regulator/da9121.h> +#include <linux/interrupt.h> +#include <linux/workqueue.h> #include "da9121-regulator.h" /* Chip data */ struct da9121 {struct device *dev; +struct delayed_work work;struct da9121_pdata *pdata;struct regmap *regmap;struct regulator_dev *rdev[DA9121_IDX_MAX ]; +unsigned int persistent[2 ]; +unsigned int passive_delay; +int chip_irq;int variant_id; };
@@ -106,6 +112,59 @@ struct da9121_field { { DA9xxx_REG_BUCK_BUCK2_4, DA9121_MASK_BUCK_BUCKx_4_CHx_A_MODE }, }; +struct status_event_data { +int buck_id;/* 0=core, 1/2-buck */ +int reg_index;/* index for status/event/mask register selection */ +int status_bit;/* bit masks... */ +int event_bit; +int mask_bit; +unsigned long notification;/* Notification for status inception */ +char *warn;/* if NULL, notify - otherwise dev_warn this string */ +}; + +#define DA9121_STATUS (id, bank, name, notification, warning) \ + { id, bank, \ + DA9121_MASK_SYS_STATUS_##bank##_##name, \ + DA9121_MASK_SYS_EVENT_##bank##_E_##name, \ + DA9121_MASK_SYS_MASK_##bank##_M_##name, \ + notification, warning } + +/* For second buck related event bits that are specific to DA9122, DA9220 variants */ +#define DA9xxx_STATUS (id, bank, name, notification, warning) \ + { id, bank, \ + DA9xxx_MASK_SYS_STATUS_##bank##_##name, \ + DA9xxx_MASK_SYS_EVENT_##bank##_E_##name, \ + DA9xxx_MASK_SYS_MASK_##bank##_M_##name, \ + notification, warning } + +/* The status signals that may need servicing, depending on device variant. +* After assertion, they persist; so event is notified, the IRQ disabled, +* and status polled until clear again and IRQ is reenabled. +* +* SG/PG1/PG2 should be set when device first powers up and should never +* re-occur. When this driver starts, it is expected that these will have +* self-cleared for when the IRQs are enabled, so these should never be seen. +* If seen, the implication is that the device has reset. +* +* GPIO0/1/2 are not configured for use by default, so should not be seen. +*/ +const struct status_event_data status_event_handling[] = { +DA9xxx_STATUS (0 ,0 ,SG ,0 ,"Handled E_SG\n" ), +DA9121_STATUS (0 ,0 ,TEMP_CRIT , (REGULATOR_EVENT_OVER_TEMP |REGULATOR_EVENT_DISABLE ),NULL ), +DA9121_STATUS (0 ,0 ,TEMP_WARN ,REGULATOR_EVENT_OVER_TEMP ,NULL ), +DA9121_STATUS (1 ,1 ,PG1 ,0 ,"Handled E_PG1\n" ), +DA9121_STATUS (1 ,1 ,OV1 ,REGULATOR_EVENT_REGULATION_OUT ,NULL ), +DA9121_STATUS (1 ,1 ,UV1 ,REGULATOR_EVENT_UNDER_VOLTAGE ,NULL ), +DA9121_STATUS (1 ,1 ,OC1 ,REGULATOR_EVENT_OVER_CURRENT ,NULL ), +DA9xxx_STATUS (2 ,1 ,PG2 ,0 ,"Handled E_PG2\n" ), +DA9xxx_STATUS (2 ,1 ,OV2 ,REGULATOR_EVENT_REGULATION_OUT ,NULL ), +DA9xxx_STATUS (2 ,1 ,UV2 ,REGULATOR_EVENT_UNDER_VOLTAGE ,NULL ), +DA9xxx_STATUS (2 ,1 ,OC2 ,REGULATOR_EVENT_OVER_CURRENT ,NULL ), +DA9121_STATUS (0 ,2 ,GPIO0 ,0 ,"Handled E_GPIO0\n" ), +DA9121_STATUS (0 ,2 ,GPIO1 ,0 ,"Handled E_GPIO1\n" ), +DA9121_STATUS (0 ,2 ,GPIO2 ,0 ,"Handled E_GPIO2\n" ), +}; +static int da9121_get_current_limit (struct regulator_dev *rdev) {struct da9121 *chip =rdev_get_drvdata (rdev);
@@ -479,6 +538,157 @@ static int da9121_of_parse_cb(struct device_node *np, [DA9121_TYPE_DA9217] = { &da9217_reg, NULL }, }; +static void da9121_status_poll_on (struct work_struct *work) +{ + struct da9121 *chip = container_of(work, struct da9121, work.work); +int status[3 ] = {0 }; +int clear[3 ] = {0 }; +unsigned long delay; +int i; +int ret; + + ret =regmap_bulk_read (chip->regmap,DA9121_REG_SYS_STATUS_0 , status,2 ); +if (ret <0 ) { +dev_err (chip->dev, +"Failed to read STATUS registers: %d\n" , ret); + goto error; + } + +/* Possible events are tested to be within range for the variant, potentially +* masked by the IRQ handler (not just warned about), as having been masked, +* and the respective state cleared - then flagged to unmask for next IRQ. +*/ +for (i =0 ; i <ARRAY_SIZE (status_event_handling); i++) { +const struct status_event_data *item = &status_event_handling[i]; +int reg_idx = item->reg_index; +bool relevant = (item->buck_id <= variant_parameters[chip->variant_id].num_bucks); +bool supported = (item->warn ==NULL ); +bool persisting = (chip->persistent[reg_idx] & item->event_bit); +bool now_cleared = !(status[reg_idx] & item->status_bit); + +if (relevant && supported && persisting && now_cleared) { + clear[reg_idx] |= item->mask_bit; + chip->persistent[reg_idx] &= ~item->event_bit; + } + } + +for (i =0 ; i <2 ; i++) { +if (clear[i]) { +unsigned int reg =DA9121_REG_SYS_MASK_0 + i; +unsigned int mbit = clear[i]; + + ret =regmap_update_bits (chip->regmap, reg, mbit,0 ); +if (ret <0 ) { +dev_err (chip->dev, +"Failed to unmask 0x%02x %d\n" , + reg, ret); + goto error; + } + } + } + +if (chip->persistent[0 ] | chip->persistent[1 ]) { + delay =msecs_to_jiffies (chip->passive_delay); +queue_delayed_work (system_freezable_wq, &chip->work, delay); + } + +error: +return ; +} + +static irqreturn_t da9121_irq_handler (int irq,void *data) +{ +struct da9121 *chip = data; +struct regulator_dev *rdev; +int event[3 ] = {0 }; +int handled[3 ] = {0 }; +int mask[3 ] = {0 }; +int ret =IRQ_NONE ; +int i; +int err; + + err =regmap_bulk_read (chip->regmap,DA9121_REG_SYS_EVENT_0 , event,3 ); +if (err <0 ) { +dev_err (chip->dev,"Failed to read EVENT registers %d\n" , err); + ret =IRQ_NONE ; + goto error; + } + + err =regmap_bulk_read (chip->regmap,DA9121_REG_SYS_MASK_0 , mask,3 ); +if (err <0 ) { +dev_err (chip->dev, +"Failed to read MASK registers: %d\n" , ret); + ret =IRQ_NONE ; + goto error; + } + + rdev = chip->rdev[DA9121_IDX_BUCK1 ]; + +/* Possible events are tested to be within range for the variant, currently +* enabled, and having triggered this IRQ. The event may then be notified, +* or a warning given for unexpected events - those from device POR, and +* currently unsupported GPIO configurations. +*/ +for (i =0 ; i <ARRAY_SIZE (status_event_handling); i++) { +const struct status_event_data *item = &status_event_handling[i]; +int reg_idx = item->reg_index; +bool relevant = (item->buck_id <= variant_parameters[chip->variant_id].num_bucks); +bool enabled = !(mask[reg_idx] & item->mask_bit); +bool active = (event[reg_idx] & item->event_bit); +bool notify = (item->warn ==NULL ); + +if (relevant && enabled && active) { +if (notify) { + chip->persistent[reg_idx] |= item->event_bit; +regulator_notifier_call_chain (rdev, item->notification,NULL ); + }else { +dev_warn (chip->dev, item->warn); + handled[reg_idx] |= item->event_bit; + ret =IRQ_HANDLED ; + } + } + } + +for (i =0 ; i <3 ; i++) { +if (event[i] != handled[i]) { +dev_warn (chip->dev, +"Unhandled event(s) in bank%d 0x%02x\n" , i, + event[i] ^ handled[i]); + } + } + +/* Mask the interrupts for persistent events OV, OC, UV, WARN, CRIT */ +for (i =0 ; i <2 ; i++) { +if (handled[i]) { +unsigned int reg =DA9121_REG_SYS_MASK_0 + i; +unsigned int mbit = handled[i]; + + err =regmap_update_bits (chip->regmap, reg, mbit, mbit); +if (err <0 ) { +dev_err (chip->dev, +"Failed to mask 0x%02x interrupt %d\n" , + reg, err); + ret =IRQ_NONE ; + goto error; + } + } + } + +/* clear the events */ +if (handled[0 ] | handled[1 ] | handled[2 ]) { + err =regmap_bulk_write (chip->regmap,DA9121_REG_SYS_EVENT_0 , handled,3 ); +if (err <0 ) { +dev_err (chip->dev,"Fail to write EVENTs %d\n" , err); + ret =IRQ_NONE ; + goto error; + } + } + +queue_delayed_work (system_freezable_wq, &chip->work,0 ); +error: +return ret; +} +static int da9121_set_regulator_config (struct da9121 *chip) {struct regulator_config config = { };
@@ -711,6 +921,56 @@ static int da9121_assign_chip_model(struct i2c_client *i2c,return ret; } +static int da9121_config_irq (struct i2c_client *i2c, +struct da9121 *chip) +{ +unsigned int p_delay =DA9121_DEFAULT_POLLING_PERIOD_MS ; +const int mask_all[4 ] = {0 ,0 ,0xFF ,0xFF }; +int ret =0 ; + + chip->chip_irq = i2c->irq; + +if (chip->chip_irq !=0 ) { +if (!of_property_read_u32 (chip->dev->of_node, +"dlg,irq-polling-delay-passive-ms" , + &p_delay)) { +if (p_delay <DA9121_MIN_POLLING_PERIOD_MS || + p_delay >DA9121_MAX_POLLING_PERIOD_MS ) { +dev_warn (chip->dev, +"Out-of-range polling period %d ms\n" , + p_delay); + p_delay =DA9121_DEFAULT_POLLING_PERIOD_MS ; + } + } + + chip->passive_delay = p_delay; + + ret =devm_request_threaded_irq (chip->dev, + chip->chip_irq,NULL , + da9121_irq_handler, +IRQF_TRIGGER_LOW |IRQF_ONESHOT , +"da9121" , chip); +if (ret !=0 ) { +dev_err (chip->dev,"Failed IRQ request: %d\n" , + chip->chip_irq); + goto error; + } + + ret =regmap_bulk_write (chip->regmap,DA9121_REG_SYS_MASK_0 , mask_all,4 ); +if (ret !=0 ) { +dev_err (chip->dev,"Failed to set IRQ masks: %d\n" , + ret); + goto error; + } + +INIT_DELAYED_WORK (&chip->work, da9121_status_poll_on); +dev_info (chip->dev,"Interrupt polling period set at %d ms\n" , + chip->passive_delay); + } +error: +return ret; +} +static const struct of_device_id da9121_dt_ids[] = { { .compatible ="dlg,da9121" , .data = (void *)DA9121_TYPE_DA9121_DA9130 }, { .compatible ="dlg,da9130" , .data = (void *)DA9121_TYPE_DA9121_DA9130 },
@@ -738,6 +998,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) {struct da9121 *chip; +const int mask_all[4 ] = {0xFF ,0xFF ,0xFF ,0xFF };int ret =0 ; chip =devm_kzalloc (&i2c->dev,sizeof (struct da9121 ),GFP_KERNEL );
@@ -753,12 +1014,36 @@ static int da9121_i2c_probe(struct i2c_client *i2c,if (ret <0 ) goto error; + ret =regmap_bulk_write (chip->regmap,DA9121_REG_SYS_MASK_0 , mask_all,4 ); +if (ret !=0 ) { +dev_err (chip->dev,"Failed to set IRQ masks: %d\n" , ret); + goto error; + } + ret =da9121_set_regulator_config (chip); +if (ret <0 ) + goto error; + + ret =da9121_config_irq (i2c, chip); error:return ret; } +static int da9121_i2c_remove (struct i2c_client *i2c) +{ +struct da9121 *chip =i2c_get_clientdata (i2c); +const int mask_all[4 ] = {0xFF ,0xFF ,0xFF ,0xFF }; +int ret =0 ; + +cancel_delayed_work_sync (&chip->work); + + ret =regmap_bulk_write (chip->regmap,DA9121_REG_SYS_MASK_0 , mask_all,4 ); +if (ret !=0 ) +dev_err (chip->dev,"Failed to set IRQ masks: %d\n" , ret); +return ret; +} +static const struct i2c_device_id da9121_i2c_id[] = { {"da9121" ,DA9121_TYPE_DA9121_DA9130 }, {"da9130" ,DA9121_TYPE_DA9121_DA9130 },
@@ -777,6 +1062,7 @@ static int da9121_i2c_probe(struct i2c_client *i2c, .of_match_table = of_match_ptr(da9121_dt_ids), }, .probe = da9121_i2c_probe, + .remove = da9121_i2c_remove, .id_table = da9121_i2c_id, };
Signature · 1 line
1.9.1
PATCH v2 7/9 regulator: da9121: add current support
In reply to Adam WardThis commit adds support for getting/setting current for all supported variants. Limits are adjusted per variant to match HW implementation.
--- drivers/regulator/da9121-regulator.c | 113 +++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+)
drivers/regulator/da9121-regulator.c +113 -0
@@ -91,6 +91,117 @@ struct da9121_variant_info { { 1, 2, &da9121_6A_2phase_current }, //DA9121_TYPE_DA9217 }; +struct da9121_field { +unsigned int reg; +unsigned int msk; +}; + +static const struct da9121_field da9121_current_field[2 ] = { + {DA9121_REG_BUCK_BUCK1_2 , DA9121_MASK_BUCK_BUCKx_2_CHx_ILIM }, + { DA9xxx_REG_BUCK_BUCK2_2, DA9121_MASK_BUCK_BUCKx_2_CHx_ILIM }, +}; + +static int da9121_get_current_limit (struct regulator_dev *rdev) +{ +struct da9121 *chip =rdev_get_drvdata (rdev); +int id =rdev_get_id (rdev); +struct da9121_range *range = + variant_parameters[chip->variant_id].current_range; +unsigned int val =0 ; +int ret =0 ; + + ret =regmap_read (chip->regmap, da9121_current_field[id].reg, &val); +if (ret <0 ) { +dev_err (chip->dev,"Cannot read BUCK register: %d\n" , ret); + goto error; + } + +if (val < range->reg_min) { + ret = -EACCES ; + goto error; + } + +if (val > range->reg_max) { + ret = -EINVAL ; + goto error; + } + +return range->val_min + (range->val_stp * (val - range->reg_min)); +error: +return ret; +} + +static int da9121_ceiling_selector (struct regulator_dev *rdev, +int min,int max, +unsigned int *selector) +{ +struct da9121 *chip =rdev_get_drvdata (rdev); +struct da9121_range *range = + variant_parameters[chip->variant_id].current_range; +unsigned int level; +unsigned int i =0 ; +unsigned int sel =0 ; +int ret =0 ; + +if (range->val_min > max || range->val_max < min) { +dev_err (chip->dev, +"Requested current out of regulator capability\n" ); + ret = -EINVAL ; + goto error; + } + + level = range->val_max; +for (i = range->reg_max; i >= range->reg_min; i--) { +if (level <= max) { + sel = i; +break ; + } + level -= range->val_stp; + } + +if (level < min) { +dev_err (chip->dev, +"Best match falls below minimum requested current\n" ); + ret = -EINVAL ; + goto error; + } + + *selector = sel; +error: +return ret; +} + +static int da9121_set_current_limit (struct regulator_dev *rdev, +int min_ua,int max_ua) +{ +struct da9121 *chip =rdev_get_drvdata (rdev); +int id =rdev_get_id (rdev); +struct da9121_range *range = + variant_parameters[chip->variant_id].current_range; +unsigned int sel =0 ; +int ret =0 ; + +if (min_ua < range->val_min || + max_ua > range->val_max) { + ret = -EINVAL ; + goto error; + } + + ret =da9121_ceiling_selector (rdev, min_ua, max_ua, &sel); +if (ret <0 ) + goto error; + + ret =regmap_update_bits (chip->regmap, + da9121_current_field[id].reg, + da9121_current_field[id].msk, + (unsigned int )sel); +if (ret <0 ) +dev_err (chip->dev,"Cannot update BUCK current limit, err: %d\n" , ret); + +error: +return ret; +} +static const struct regulator_ops da9121_buck_ops = { .enable = regulator_enable_regmap, .disable = regulator_disable_regmap,
@@ -98,6 +209,8 @@ struct da9121_variant_info { .set_voltage_sel = regulator_set_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear, + .get_current_limit = da9121_get_current_limit, + .set_current_limit = da9121_set_current_limit, };static struct of_regulator_match da9121_matches[] = {
Signature · 1 line
1.9.1
Mark Brown
maintainerQuoted 9 lines · Adam Ward
regulator: da9121: add interrupt support
drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 1033 ++++++++++++++++++++++++++++++++-- drivers/regulator/da9121-regulator.h | 291 ++++++++++ include/linux/regulator/da9121.h | 36 ++ 4 files changed, 1336 insertions(+), 38 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h create mode 100644 include/linux/regulator/da9121.h
This adds new compatible strings so needs to update the binding document too.