RE: [PATCH v4] mfd: da9063: Support SMBus and I2C mode
Hi Lee,
Tidy, but I've noticed the logic got inverted along the way:
> On Tue 09 Mar 2021, Lee Jones wrote:
> On Tue, 09 Mar 2021, Mark Jonas wrote:
> This is my suggestion:
>
> /* If SMBus Mode is not available, enter Two-Wire Mode */
> if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C)) {
Determine bus *is* I2C, so assume SMBus timings not supported...
if (i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C)) {
> ret = regmap_update_bits(da9063->regmap, DA9063_REG_CONFIG_J,
>DA9063_TWOWIRE_TO, DA9063_TWOWIRE_TO);
...and *clear* the (currently set by default) timeout bit:
DA9063_TWOWIRE_TO, 0);
> if (ret < 0) {
> dev_err(da9063->dev, "Failed to set Two-Wire Bus
> Mode\n");
> return -EIO;
> }
> }
I think you're right to exclude a case; vendor motivation to override the TO
default seems inherently trustworthy.
Best regards,
Adam
RE: [PATCH V4 01/10] regulator: Update DA9121 dt-bindings
On Mon, Dec 07, 2020 at 17:58PM, Rob Herring wrote: > > +properties: > > + regulator-mode: > > +maxItems: 1 > > +description: Defined in > > include/dt-bindings/regulator/dlg,da9121- > regulator.h > > 'regulator-mode' is defined as a property of a > 'regulator-state-(standby|mem|disk)' child node. I don't see how you > would use this with 'regulator-initial-mode' either. > > > + > > + regulator-initial-mode: > > +maxItems: 1 > > 'maxItems' applies to arrays and this is not an array. What you should > have is constraints on the values: > > enum: [ 0, 1, 2, 3 ] OK, I see better now - would this be the valid way to scope them both? properties: regulator-state-(standby|mem|disk): type: object properties: regulator-mode: enum: [ 0, 1, 2, 3 ] description: Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h regulator-initial-mode: enum: [ 0, 1, 2, 3 ] description: Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h I couldn't find a precedent in regulator yaml, and it's far removed enough from what I see in the abstract JSON-schema documentation to make relating them tricky, even if I had sufficient familiarity with the terminology to believe I'd properly understood that! Perhaps I'd be better off abandoning this attempt, and just having the regulator description mention these properties/file, like the texts for act8865 and max77802 do?
RE: [PATCH] regulator: da9121: Potential Oops in da9121_assign_chip_model()
Acked-by: Adam Ward
> -Original Message-
> From: Dan Carpenter
> Sent: 07 December 2020 17:56
> To: Support Opensource ; Adam Ward
>
> Cc: Liam Girdwood ; Mark Brown
> ; linux-kernel@vger.kernel.org; kernel-
> janit...@vger.kernel.org
> Subject: [PATCH] regulator: da9121: Potential Oops in
> da9121_assign_chip_model()
>
> There is a missing "return ret;" on this error path so we call
> "da9121_check_device_type(i2c, chip);" which will end up dereferencing
> "chip->regmap" and lead to an Oops.
>
> Fixes: c860476b9e3a ("regulator: da9121: Add device variant regmaps")
> Signed-off-by: Dan Carpenter
> ---
> drivers/regulator/da9121-regulator.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-
> regulator.c
> index db1c2cc838bc..e4fc3a7cd5d8 100644
> --- a/drivers/regulator/da9121-regulator.c
> +++ b/drivers/regulator/da9121-regulator.c
> @@ -915,6 +915,7 @@ static int da9121_assign_chip_model(struct i2c_client
> *i2c,
> ret = PTR_ERR(chip->regmap);
> dev_err(chip->dev, "Failed to configure a register map: %d\n",
> ret);
> + return ret;
> }
>
> ret = da9121_check_device_type(i2c, chip);
> --
> 2.29.2
[PATCH 1/2] regulator: da9121: Remove uninitialised string variable
Erroneously left in when switched to using of_parse_cb()
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index db1c2cc..ed68259 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -816,7 +816,6 @@ static int da9121_check_device_type(struct i2c_client *i2c,
struct da9121 *chip)
u32 variant_id;
u8 variant_mrc, variant_vrc;
char *type;
- const char *name;
bool config_match = false;
int ret = 0;
@@ -867,7 +866,7 @@ static int da9121_check_device_type(struct i2c_client *i2c,
struct da9121 *chip)
device_id, variant_id, type);
if (!config_match) {
- dev_err(chip->dev, "Device tree configuration '%s' does not
match detected device.\n", name);
+ dev_err(chip->dev, "Device tree configuration does not match
detected device.\n");
ret = -EINVAL;
goto error;
}
--
1.9.1
[PATCH 2/2] regulator: da9121: Fix index used for DT property
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index ed68259..9d5b02f 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -381,7 +381,7 @@ static int da9121_of_parse_cb(struct device_node *np,
uint32_t ripple_reg;
int ret;
- if
(of_property_read_u32(da9121_matches[pdata->num_buck].of_node,
+ if
(of_property_read_u32(da9121_matches[pdata->num_buck-1].of_node,
"dlg,ripple-cancel", _cancel)) {
if (pdata->num_buck > 1)
ripple_reg = DA9xxx_REG_BUCK_BUCK2_7;
--
1.9.1
[PATCH 0/2] regulator: da9121: bug fixes
This patch fixes a couple of bugs in the DA9121 driver. One in an uninialised string I forgot to remove when changing to of_parse_cb() The other is an index for an optional DT property which overflows Adam Ward (2): regulator: da9121: Remove uninitialised string variable regulator: da9121: Fix index used for DT property drivers/regulator/da9121-regulator.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 1.9.1
RE: [PATCH -next] regulator: da9121: Mark some symbols with static keyword
Acked-by: Adam Ward
> -Original Message-
> From: Zou Wei
> Sent: 03 December 2020 11:27
> To: Support Opensource ;
> lgirdw...@gmail.com; broo...@kernel.org
> Cc: linux-kernel@vger.kernel.org; Zou Wei
> Subject: [PATCH -next] regulator: da9121: Mark some symbols with static
> keyword
>
> Fix the following sparse warnings:
>
> drivers/regulator/da9121-regulator.c:55:21: warning: symbol
> 'da9121_10A_2phase_current' was not declared. Should it be static?
> drivers/regulator/da9121-regulator.c:63:21: warning: symbol
> 'da9121_6A_2phase_current' was not declared. Should it be static?
> drivers/regulator/da9121-regulator.c:71:21: warning: symbol
> 'da9121_5A_1phase_current' was not declared. Should it be static?
> drivers/regulator/da9121-regulator.c:79:21: warning: symbol
> 'da9121_3A_1phase_current' was not declared. Should it be static?
> drivers/regulator/da9121-regulator.c:151:32: warning: symbol
> 'status_event_handling' was not declared. Should it be static?
>
> Signed-off-by: Zou Wei
> ---
> drivers/regulator/da9121-regulator.c | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/regulator/da9121-regulator.c b/drivers/regulator/da9121-
> regulator.c
> index 3ead6a1..893512c 100644
> --- a/drivers/regulator/da9121-regulator.c
> +++ b/drivers/regulator/da9121-regulator.c
> @@ -52,7 +52,7 @@ struct da9121_range {
> int reg_max;
> };
>
> -struct da9121_range da9121_10A_2phase_current = {
> +static struct da9121_range da9121_10A_2phase_current = {
> .val_min = 700,
> .val_max = 2000,
> .val_stp = 100,
> @@ -60,7 +60,7 @@ struct da9121_range da9121_10A_2phase_current = {
> .reg_max = 14,
> };
>
> -struct da9121_range da9121_6A_2phase_current = {
> +static struct da9121_range da9121_6A_2phase_current = {
> .val_min = 700,
> .val_max = 1200,
> .val_stp = 100,
> @@ -68,7 +68,7 @@ struct da9121_range da9121_6A_2phase_current = {
> .reg_max = 6,
> };
>
> -struct da9121_range da9121_5A_1phase_current = {
> +static struct da9121_range da9121_5A_1phase_current = {
> .val_min = 350,
> .val_max = 1000,
> .val_stp = 50,
> @@ -76,7 +76,7 @@ struct da9121_range da9121_5A_1phase_current = {
> .reg_max = 14,
> };
>
> -struct da9121_range da9121_3A_1phase_current = {
> +static struct da9121_range da9121_3A_1phase_current = {
> .val_min = 350,
> .val_max = 600,
> .val_stp = 50,
> @@ -148,7 +148,7 @@ struct status_event_data {
> *
> * GPIO0/1/2 are not configured for use by default, so should not be seen.
> */
> -const struct status_event_data status_event_handling[] = {
> +static 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),
> --
> 2.6.2
[PATCH V2 0/1] regulator: da9121: add IRQ free to release function
This patch fixes the DA9121 driver to disable the IRQ before cancelling the work, to be sure the IRQ doesn't restart it before all IRQs are masked V2: - Fix to release IRQ if regmap error fails probe Adam Ward (1): regulator: da9121: Request IRQ directly and free in release function to avoid masking race drivers/regulator/da9121-regulator.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 1.9.1
[PATCH V2 1/1] regulator: da9121: Request IRQ directly and free in release function to avoid masking race
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index d9a8a4b..3ead6a1 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -945,8 +945,7 @@ static int da9121_config_irq(struct i2c_client *i2c,
chip->passive_delay = p_delay;
- ret = devm_request_threaded_irq(chip->dev,
- chip->chip_irq, NULL,
+ ret = request_threaded_irq(chip->chip_irq, NULL,
da9121_irq_handler,
IRQF_TRIGGER_LOW|IRQF_ONESHOT,
"da9121", chip);
@@ -960,7 +959,7 @@ static int da9121_config_irq(struct i2c_client *i2c,
if (ret != 0) {
dev_err(chip->dev, "Failed to set IRQ masks: %d\n",
ret);
- goto error;
+ goto regmap_error;
}
INIT_DELAYED_WORK(>work, da9121_status_poll_on);
@@ -969,6 +968,9 @@ static int da9121_config_irq(struct i2c_client *i2c,
}
error:
return ret;
+regmap_error:
+ free_irq(chip->chip_irq, chip);
+ return ret;
}
static const struct of_device_id da9121_dt_ids[] = {
@@ -1036,6 +1038,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
int ret = 0;
+ free_irq(chip->chip_irq, chip);
cancel_delayed_work_sync(>work);
ret = regmap_bulk_write(chip->regmap, DA9121_REG_SYS_MASK_0, mask_all,
4);
--
1.9.1
[PATCH 1/1] regulator: da9121: Request IRQ directly and free in release function to avoid masking race
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index d9a8a4b..3e59f68 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -945,8 +945,7 @@ static int da9121_config_irq(struct i2c_client *i2c,
chip->passive_delay = p_delay;
- ret = devm_request_threaded_irq(chip->dev,
- chip->chip_irq, NULL,
+ ret = request_threaded_irq(chip->chip_irq, NULL,
da9121_irq_handler,
IRQF_TRIGGER_LOW|IRQF_ONESHOT,
"da9121", chip);
@@ -1036,6 +1035,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
int ret = 0;
+ free_irq(chip->chip_irq, chip);
cancel_delayed_work_sync(>work);
ret = regmap_bulk_write(chip->regmap, DA9121_REG_SYS_MASK_0, mask_all,
4);
--
1.9.1
[PATCH 0/1] regulator: da9121: add IRQ free to release function
This patch fixes the DA9121 driver to disable the IRQ before cancelling the work, to be sure the IRQ doesn't restart it before all IRQs are masked Adam Ward (1): regulator: da9121: Request IRQ directly and free in release function to avoid masking race drivers/regulator/da9121-regulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1
[PATCH V4 10/10] regulator: da9121: add interrupt support
Adds 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.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 286 +++
1 file changed, 286 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 8e50f55..3e59f68 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -23,15 +23,21 @@
#include
#include
#include
+#include
+#include
#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] = { _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++) {
+
[PATCH V4 07/10] regulator: da9121: Update registration to support multiple buck variants
Add function which iterates the regulator descriptors for the confirmed
variant ID and registers each buck.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 44 +---
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 1f74371..6c82441 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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] = { _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, );
+ 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 = >dev;
- struct regulator_config config = {};
- struct regulator_dev *rdev;
chip = devm_kzalloc(>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 = >dev;
- config.driver_data = chip;
- config.of_node = dev->of_node;
- config.regmap = chip->regmap;
-
- rdev = devm_regulator_register(>dev, _reg, );
- if (IS_ERR(rdev)) {
- dev_err(>dev, "Failed to register da9121 regulator\n");
- return PTR_ERR(rdev);
- }
+ ret = da9121_set_regulator_config(chip);
error:
return ret;
--
1.9.1
[PATCH V4 04/10] regulator: da9121: Add device variant regmaps
Add ability to probe device and validate configuration, then apply a regmap
configuration for a single or dual buck device accordingly.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index ca908bd..5371709 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -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.
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5bebdb2..137b1df 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -1,5 +1,17 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020 Axis Communications AB */
+//
+// DA9121 Single-channel dual-phase 10A buck converter
+//
+// Copyright (C) 2020 Axis Communications AB
+//
+// 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
#include
#include
@@ -9,26 +21,17 @@
#include
#include
#include
+#include
+
#include "da9121-regulator.h"
/* Chip data */
struct da9121 {
struct device *dev;
+ struct regmap *regmap;
int variant_id;
};
-#define DA9121_MIN_MV 300
-#define DA9121_MAX_MV 1900
-#define DA9121_STEP_MV 10
-#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
-#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
-+ 1 + DA9121_MIN_SEL)
-
-static const struct regmap_config da9121_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-};
-
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -38,6 +41,13 @@ struct da9121 {
.list_voltage = regulator_list_voltage_linear,
};
+#define DA9121_MIN_MV 300
+#define DA9121_MAX_MV 1900
+#define DA9121_STEP_MV 10
+#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
+#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
++ 1 + DA9121_MIN_SEL)
+
static const struct regulator_desc da9121_reg = {
.name = "da9121",
.of_match = "buck1",
@@ -58,6 +68,205 @@ struct da9121 {
.enable_time = 20,
};
+/* 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),
+ regmap_reg_range(DA9121_REG_SYS_CONFIG_2, DA9121_REG_SYS_CONFIG_3),
+ regmap_reg_range(DA9121_REG_SYS_GPIO0_0, DA9121_REG_SYS_GPIO2_1),
+ regmap_reg_range(DA9121_REG_BUCK_BUCK1_0, DA9121_REG_BUCK_BUCK1_6),
+ regmap_reg_range(DA9121_REG_OTP_DEVICE_ID, DA9121_REG_OTP_CONFIG_ID),
+};
+
+static const struct regmap_access_table da9121_1ch_readable_table = {
+ .yes_ranges = da9121_1ch_readable_ranges,
+ .n_yes_ranges = ARRAY_SIZE(da9121_1ch_readable_ranges),
+};
+
+static const struct regmap_range da9121_2ch_readable_ranges[] = {
+ regmap_reg_range(DA9121_REG_SYS_STATUS_0, DA9121_REG_SYS_MASK_3),
+ regmap_reg_range(DA9121_REG_SYS_CO
[PATCH V4 08/10] regulator: da9121: add current support
This commit adds support for getting/setting current for all supported
variants. Limits are adjusted per variant to match HW implementation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 113 +++
1 file changed, 113 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 6c82441..a69acb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -91,6 +91,117 @@ struct da9121_variant_info {
{ 1, 2, _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, );
+ 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, );
+ 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[] = {
--
1.9.1
[PATCH V4 09/10] regulator: da9121: add mode support
Adds get/set for mode, and mapping from REGULATOR_MODE_* to select
PFM/PWM/Auto operation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 74
1 file changed, 74 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a69acb2..8e50f55 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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, );
+ 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 = _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 = _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 = _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,
[PATCH V4 03/10] regulator: da9121: Add device variants
Add basic support for configuration to reference variants of this device,
and track the selected variant within the driver.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 46 +---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index c11fe04..5bebdb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -11,6 +11,12 @@
#include
#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 = >dev;
struct regulator_config config = {};
struct regulator_dev *rdev;
struct regmap *regmap;
+ chip = devm_kzalloc(>dev, sizeof(struct da9121), GFP_KERNEL);
+ if (!chip) {
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ chip->variant_id = da9121_of_get_id(>dev);
+
regmap = devm_regmap_init_i2c(i2c, _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);
--
1.9.1
[PATCH V4 06/10] regulator: da9121: Add support for device variants via devicetree
Add devicetree configuration and device variant parameters. Use the latter
to enable the check and use of parameters specific to dual buck variants.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 119 +++
include/linux/regulator/da9121.h | 11
2 files changed, 130 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a717e2b..1f74371 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -14,6 +14,7 @@
// Copyright (C) 2020 Dialog Semiconductor
#include
+#include
#include
#include
#include
@@ -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 = 700,
+ .val_max = 2000,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_6A_2phase_current = {
+ .val_min = 700,
+ .val_max = 1200,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 6,
+};
+
+struct da9121_range da9121_5A_1phase_current = {
+ .val_min = 350,
+ .val_max = 1000,
+ .val_stp = 50,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_3A_1phase_current = {
+ .val_min = 350,
+ .val_max = 600,
+ .val_stp = 50,
+ .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, _10A_2phase_current }, //DA9121_TYPE_DA9121_DA9130
+ { 2, 1, _3A_1phase_current }, //DA9121_TYPE_DA9220_DA9132
+ { 2, 1, _5A_1phase_current }, //DA9121_TYPE_DA9122_DA9131
+ { 1, 2, _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", _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",
[PATCH V4 05/10] regulator: da9121: Add device variant descriptors
Descriptors for bucks in all variants, ready for of_regulator_match
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 110 +++
1 file changed, 110 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 137b1df..a717e2b 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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 = _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 = _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 = _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 = _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 = _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 = _buck_ops,
+ .type = REGULATOR_VOLTAGE,
+ .n_voltages = DA9121_N_VOLTAGES,
+ .min_uV = DA9121_MIN_MV * 1000,
+
[PATCH V4 00/10] 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 V4: - Request IRQ directly and free in release function to avoid masking race V3: - Restored missing DT bindings patch 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 (10): regulator: Update DA9121 dt-bindings 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 .../devicetree/bindings/regulator/dlg,da9121.yaml | 164 +++- MAINTAINERS|2 + drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 1033 +++- drivers/regulator/da9121-regulator.h | 291 ++ .../dt-bindings/regulator/dlg,da9121-regulator.h | 22 + include/linux/regulator/da9121.h | 36 + 7 files changed, 1513 insertions(+), 49 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h create mode 100644 include/linux/regulator/da9121.h -- 1.9.1
[PATCH V4 01/10] regulator: Update DA9121 dt-bindings
Update bindings for the Dialog Semiconductor DA9121 voltage regulator to
add device variants.
Because several variants have multiple regulators, and to regard potential
to add GPIO support in future, the 'regulators' sub-node is added,
following the precedent set by other multi-regulator devices, including
the DA9211 family. This breaks compatibility with the original submission
by Vincent Whitchurch - but as this is still in for-next, the alignment
could be made before upstreaming occurs.
Signed-off-by: Adam Ward
---
.../devicetree/bindings/regulator/dlg,da9121.yaml | 164 +++--
MAINTAINERS| 2 +
.../dt-bindings/regulator/dlg,da9121-regulator.h | 22 +++
3 files changed, 177 insertions(+), 11 deletions(-)
create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h
diff --git a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
index 2ece46e..6f2164f 100644
--- a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
+++ b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
@@ -7,41 +7,183 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Dialog Semiconductor DA9121 voltage regulator
maintainers:
- - Vincent Whitchurch
+ - Adam Ward
+
+description: |
+ Dialog Semiconductor DA9121 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9122 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9220 Double-channel 3A single-phase buck converter
+ Dialog Semiconductor DA9217 Single-channel 6A double-phase buck converter
+ Dialog Semiconductor DA9130 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9131 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9132 Double-channel 3A single-phase buck converter
+
+ Current limits
+
+ This is PER PHASE, and the current limit setting in the devices reflect
+ that with a maximum 10A limit. Allowing for transients at/near double
+ the rated current, this translates across the device range to per
+ channel figures as so...
+
+ | DA9121DA9122 DA9220DA9217 DA9140
+ | /DA9130 /DA9131/DA9132
+
-
+Output current / channel | 1000 500 300 600
4000
+Output current / phase | 500 500 300 300
950
+
-
+Min regulator-min-microvolt| 30303030
50
+Max regulator-max-microvolt| 190 190 190 190
100
+Device hardware default| 100 100 100 100
100
+
-
+Min regulator-min-microamp | 700 350 350 700
2600
+Max regulator-max-microamp | 2000 1000 600 1200
7800
+Device hardware default| 1500 750 550 1100
5800
properties:
+ $nodename:
+pattern: "pmic@[0-9a-f]{1,2}"
compatible:
-const: dlg,da9121
+enum:
+ - dlg,da9121
+ - dlg,da9122
+ - dlg,da9220
+ - dlg,da9217
+ - dlg,da9130
+ - dlg,da9131
+ - dlg,da9132
+ - dlg,da9140
reg:
maxItems: 1
+description: Specifies the I2C slave address.
+
+ interrupts:
+maxItems: 1
+description: IRQ line information.
+
+ dlg,irq-polling-delay-passive-ms:
+$ref: "/schemas/types.yaml#/definitions/uint32"
+minimum: 1000
+maximum: 1
+description: |
+ Specify the polling period, measured in milliseconds, between interrupt
status
+ update checks. Range 1000-1 ms.
- buck1:
-description:
- Initial data for the Buck1 regulator.
-$ref: "regulator.yaml#"
+ regulators:
type: object
+$ref: regulator.yaml#
+description: |
+ This node defines the settings for the BUCK. The content of the
+ sub-node is defined by the standard binding for regulators; see
regulator.yaml.
+ The DA9121 regulator is bound using their names listed below
+ buck1 - BUCK1
+ buck2 - BUCK2 //DA9122, DA9220, DA9131, DA9132 only
-additionalProperties: false
+patternProperties:
+ "^buck([1-2])$":
+type: object
+$ref: regulator.yaml#
+
+properties:
+ regulator-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
+
+ regulator-initial-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
+
+ enable-gpios:
+maxItems: 1
+
[PATCH V4 02/10] 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.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 66bdfd1..c11fe04 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -9,12 +9,7 @@
#include
#include
#include
-
-#define DA9121_BUCK_BUCK1_00x20
-#define DA9121_BUCK_BUCK1_0_CH1_EN BIT(0)
-
-#define DA9121_BUCK_BUCK1_50x25
-#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 = 2,
/* tBUCK_EN */
diff --git a/drivers/regulator/da9121-regulator.h
b/drivers/regulator/da9121-regulator.h
new file mode 100644
index 000..3c34cb8
--- /dev/null
+++ b/drivers/regulator/da9121-regulator.h
@@ -0,0 +1,291 @@
+/* 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: Steve Twiss, Dialog Semiconductor
+ * Adam Ward, Dialog Semiconductor
+ */
+
+#ifndef __DA9121_REGISTERS_H__
+#define __DA9121_REGISTERS_H__
+
+/* Values for: DA9121_REG_BUCK_BUCKx_4 registers, fields CHx_y_MODE
+ * DA9121_REG_BUCK_BUCKx_7 registers, fields CHx_RIPPLE_CANCEL
+ */
+#include
+
+enum da9121_variant {
+ DA9121_TYPE_DA9121_DA9130,
+ DA9121_TYPE_DA9220_DA9132,
+ DA9121_TYPE_DA9122_DA9131,
+ DA9121_TYPE_DA9217
+};
+
+/* Minimum, maximum and default polling millisecond periods are provided
+ * here as an example. It is expected that any final implementation will
+ * include a modification of these settings to match the required
+ * application.
+ */
+#define DA9121_DEFAULT_POLLING_PERIOD_MS 3000
+#define DA9121_MAX_POLLING_PERIOD_MS 1
+#define DA9121_MIN_POLLING_PERIOD_MS 1000
+
+/* Registers */
+
+#define DA9121_REG_SYS_STATUS_00x01
+#define DA9121_REG_SYS_STATUS_10x02
+#define DA9121_REG_SYS_STATUS_20x03
+#define DA9121_REG_SYS_EVENT_0 0x04
+#define DA9121_REG_SYS_EVENT_1 0x05
+#define DA9121_REG_SYS_EVENT_2 0x06
+#define DA9121_REG_SYS_MASK_0 0x07
+#define DA9121_REG_SYS_MASK_1 0x08
+#define DA9121_REG_SYS_MASK_2 0x09
+#define DA9121_REG_SYS_MASK_3 0x0A
+#define DA9121_REG_SYS_CONFIG_00x0B
+#define DA9121_REG_SYS_CONFIG_10x0C
+#define DA9121_REG_SYS_CONFIG_20x0D
+#define DA9121_REG_SYS_CONFIG_30x0E
+#define DA9121_REG_SYS_GPIO0_0 0x10
+#define DA9121_REG_SYS_GPIO0_1 0x11
+#define DA9121_REG_SYS_GPIO1_0 0x12
+#define DA9121_REG_SYS_GPIO1_1 0x13
+#define DA9121_REG_SYS_GPIO2_0 0x14
+#define DA9121_REG_SYS_GPIO2_1 0x15
+#define DA9121_REG_BUCK_BUCK1_00x20
+#define DA9121_REG_BUCK_BUCK1_10x21
+#define DA9121_REG_BUCK_BUCK1_20x22
+#define DA9121_REG_BUCK_BUCK1_30x23
+#define DA9121_REG_BUCK_BUCK1_40x24
+#define DA9121_REG_BUCK_BUCK1_50x25
+#define DA9121_REG_BUCK_BUCK1_60x26
+#define DA9121_REG_BUCK_BUCK1_70x27
+#define DA9xxx_REG_BUCK_BUCK2_00x28
+#define DA9xxx_REG_BUCK_BUCK2_10x29
+#define DA9xxx_REG_BUCK_BUCK2_20x2A
+#define DA9xxx_REG_BUCK_BUCK2_30x2B
+#define DA9xxx_REG_BUCK_BUCK2_4
[PATCH V3 04/10] regulator: da9121: Add device variant regmaps
Add ability to probe device and validate configuration, then apply a regmap
configuration for a single or dual buck device accordingly.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index ca908bd..5371709 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -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.
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5bebdb2..137b1df 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -1,5 +1,17 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020 Axis Communications AB */
+//
+// DA9121 Single-channel dual-phase 10A buck converter
+//
+// Copyright (C) 2020 Axis Communications AB
+//
+// 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
#include
#include
@@ -9,26 +21,17 @@
#include
#include
#include
+#include
+
#include "da9121-regulator.h"
/* Chip data */
struct da9121 {
struct device *dev;
+ struct regmap *regmap;
int variant_id;
};
-#define DA9121_MIN_MV 300
-#define DA9121_MAX_MV 1900
-#define DA9121_STEP_MV 10
-#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
-#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
-+ 1 + DA9121_MIN_SEL)
-
-static const struct regmap_config da9121_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-};
-
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -38,6 +41,13 @@ struct da9121 {
.list_voltage = regulator_list_voltage_linear,
};
+#define DA9121_MIN_MV 300
+#define DA9121_MAX_MV 1900
+#define DA9121_STEP_MV 10
+#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
+#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
++ 1 + DA9121_MIN_SEL)
+
static const struct regulator_desc da9121_reg = {
.name = "da9121",
.of_match = "buck1",
@@ -58,6 +68,205 @@ struct da9121 {
.enable_time = 20,
};
+/* 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),
+ regmap_reg_range(DA9121_REG_SYS_CONFIG_2, DA9121_REG_SYS_CONFIG_3),
+ regmap_reg_range(DA9121_REG_SYS_GPIO0_0, DA9121_REG_SYS_GPIO2_1),
+ regmap_reg_range(DA9121_REG_BUCK_BUCK1_0, DA9121_REG_BUCK_BUCK1_6),
+ regmap_reg_range(DA9121_REG_OTP_DEVICE_ID, DA9121_REG_OTP_CONFIG_ID),
+};
+
+static const struct regmap_access_table da9121_1ch_readable_table = {
+ .yes_ranges = da9121_1ch_readable_ranges,
+ .n_yes_ranges = ARRAY_SIZE(da9121_1ch_readable_ranges),
+};
+
+static const struct regmap_range da9121_2ch_readable_ranges[] = {
+ regmap_reg_range(DA9121_REG_SYS_STATUS_0, DA9121_REG_SYS_MASK_3),
+ regmap_reg_range(DA9121_REG_SYS_CO
[PATCH V3 09/10] regulator: da9121: add mode support
Adds get/set for mode, and mapping from REGULATOR_MODE_* to select
PFM/PWM/Auto operation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 74
1 file changed, 74 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a69acb2..8e50f55 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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, );
+ 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 = _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 = _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 = _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,
[PATCH V3 05/10] regulator: da9121: Add device variant descriptors
Descriptors for bucks in all variants, ready for of_regulator_match
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 110 +++
1 file changed, 110 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 137b1df..a717e2b 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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 = _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 = _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 = _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 = _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 = _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 = _buck_ops,
+ .type = REGULATOR_VOLTAGE,
+ .n_voltages = DA9121_N_VOLTAGES,
+ .min_uV = DA9121_MIN_MV * 1000,
+
[PATCH V3 08/10] regulator: da9121: add current support
This commit adds support for getting/setting current for all supported
variants. Limits are adjusted per variant to match HW implementation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 113 +++
1 file changed, 113 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 6c82441..a69acb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -91,6 +91,117 @@ struct da9121_variant_info {
{ 1, 2, _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, );
+ 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, );
+ 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[] = {
--
1.9.1
[PATCH V3 10/10] regulator: da9121: add interrupt support
Adds 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.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 286 +++
1 file changed, 286 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 8e50f55..d9a8a4b 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -23,15 +23,21 @@
#include
#include
#include
+#include
+#include
#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] = { _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++) {
+
[PATCH V3 07/10] regulator: da9121: Update registration to support multiple buck variants
Add function which iterates the regulator descriptors for the confirmed
variant ID and registers each buck.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 44 +---
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 1f74371..6c82441 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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] = { _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, );
+ 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 = >dev;
- struct regulator_config config = {};
- struct regulator_dev *rdev;
chip = devm_kzalloc(>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 = >dev;
- config.driver_data = chip;
- config.of_node = dev->of_node;
- config.regmap = chip->regmap;
-
- rdev = devm_regulator_register(>dev, _reg, );
- if (IS_ERR(rdev)) {
- dev_err(>dev, "Failed to register da9121 regulator\n");
- return PTR_ERR(rdev);
- }
+ ret = da9121_set_regulator_config(chip);
error:
return ret;
--
1.9.1
[PATCH V3 06/10] regulator: da9121: Add support for device variants via devicetree
Add devicetree configuration and device variant parameters. Use the latter
to enable the check and use of parameters specific to dual buck variants.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 119 +++
include/linux/regulator/da9121.h | 11
2 files changed, 130 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a717e2b..1f74371 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -14,6 +14,7 @@
// Copyright (C) 2020 Dialog Semiconductor
#include
+#include
#include
#include
#include
@@ -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 = 700,
+ .val_max = 2000,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_6A_2phase_current = {
+ .val_min = 700,
+ .val_max = 1200,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 6,
+};
+
+struct da9121_range da9121_5A_1phase_current = {
+ .val_min = 350,
+ .val_max = 1000,
+ .val_stp = 50,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_3A_1phase_current = {
+ .val_min = 350,
+ .val_max = 600,
+ .val_stp = 50,
+ .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, _10A_2phase_current }, //DA9121_TYPE_DA9121_DA9130
+ { 2, 1, _3A_1phase_current }, //DA9121_TYPE_DA9220_DA9132
+ { 2, 1, _5A_1phase_current }, //DA9121_TYPE_DA9122_DA9131
+ { 1, 2, _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", _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",
[PATCH V3 03/10] regulator: da9121: Add device variants
Add basic support for configuration to reference variants of this device,
and track the selected variant within the driver.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 46 +---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index c11fe04..5bebdb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -11,6 +11,12 @@
#include
#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 = >dev;
struct regulator_config config = {};
struct regulator_dev *rdev;
struct regmap *regmap;
+ chip = devm_kzalloc(>dev, sizeof(struct da9121), GFP_KERNEL);
+ if (!chip) {
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ chip->variant_id = da9121_of_get_id(>dev);
+
regmap = devm_regmap_init_i2c(i2c, _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);
--
1.9.1
[PATCH V3 02/10] 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.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 66bdfd1..c11fe04 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -9,12 +9,7 @@
#include
#include
#include
-
-#define DA9121_BUCK_BUCK1_00x20
-#define DA9121_BUCK_BUCK1_0_CH1_EN BIT(0)
-
-#define DA9121_BUCK_BUCK1_50x25
-#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 = 2,
/* tBUCK_EN */
diff --git a/drivers/regulator/da9121-regulator.h
b/drivers/regulator/da9121-regulator.h
new file mode 100644
index 000..3c34cb8
--- /dev/null
+++ b/drivers/regulator/da9121-regulator.h
@@ -0,0 +1,291 @@
+/* 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: Steve Twiss, Dialog Semiconductor
+ * Adam Ward, Dialog Semiconductor
+ */
+
+#ifndef __DA9121_REGISTERS_H__
+#define __DA9121_REGISTERS_H__
+
+/* Values for: DA9121_REG_BUCK_BUCKx_4 registers, fields CHx_y_MODE
+ * DA9121_REG_BUCK_BUCKx_7 registers, fields CHx_RIPPLE_CANCEL
+ */
+#include
+
+enum da9121_variant {
+ DA9121_TYPE_DA9121_DA9130,
+ DA9121_TYPE_DA9220_DA9132,
+ DA9121_TYPE_DA9122_DA9131,
+ DA9121_TYPE_DA9217
+};
+
+/* Minimum, maximum and default polling millisecond periods are provided
+ * here as an example. It is expected that any final implementation will
+ * include a modification of these settings to match the required
+ * application.
+ */
+#define DA9121_DEFAULT_POLLING_PERIOD_MS 3000
+#define DA9121_MAX_POLLING_PERIOD_MS 1
+#define DA9121_MIN_POLLING_PERIOD_MS 1000
+
+/* Registers */
+
+#define DA9121_REG_SYS_STATUS_00x01
+#define DA9121_REG_SYS_STATUS_10x02
+#define DA9121_REG_SYS_STATUS_20x03
+#define DA9121_REG_SYS_EVENT_0 0x04
+#define DA9121_REG_SYS_EVENT_1 0x05
+#define DA9121_REG_SYS_EVENT_2 0x06
+#define DA9121_REG_SYS_MASK_0 0x07
+#define DA9121_REG_SYS_MASK_1 0x08
+#define DA9121_REG_SYS_MASK_2 0x09
+#define DA9121_REG_SYS_MASK_3 0x0A
+#define DA9121_REG_SYS_CONFIG_00x0B
+#define DA9121_REG_SYS_CONFIG_10x0C
+#define DA9121_REG_SYS_CONFIG_20x0D
+#define DA9121_REG_SYS_CONFIG_30x0E
+#define DA9121_REG_SYS_GPIO0_0 0x10
+#define DA9121_REG_SYS_GPIO0_1 0x11
+#define DA9121_REG_SYS_GPIO1_0 0x12
+#define DA9121_REG_SYS_GPIO1_1 0x13
+#define DA9121_REG_SYS_GPIO2_0 0x14
+#define DA9121_REG_SYS_GPIO2_1 0x15
+#define DA9121_REG_BUCK_BUCK1_00x20
+#define DA9121_REG_BUCK_BUCK1_10x21
+#define DA9121_REG_BUCK_BUCK1_20x22
+#define DA9121_REG_BUCK_BUCK1_30x23
+#define DA9121_REG_BUCK_BUCK1_40x24
+#define DA9121_REG_BUCK_BUCK1_50x25
+#define DA9121_REG_BUCK_BUCK1_60x26
+#define DA9121_REG_BUCK_BUCK1_70x27
+#define DA9xxx_REG_BUCK_BUCK2_00x28
+#define DA9xxx_REG_BUCK_BUCK2_10x29
+#define DA9xxx_REG_BUCK_BUCK2_20x2A
+#define DA9xxx_REG_BUCK_BUCK2_30x2B
+#define DA9xxx_REG_BUCK_BUCK2_4
[PATCH V3 01/10] regulator: Update DA9121 dt-bindings
Update bindings for the Dialog Semiconductor DA9121 voltage regulator to
add device variants.
Because several variants have multiple regulators, and to regard potential
to add GPIO support in future, the 'regulators' sub-node is added,
following the precedent set by other multi-regulator devices, including
the DA9211 family. This breaks compatibility with the original submission
by Vincent Whitchurch - but as this is still in for-next, the alignment
could be made before upstreaming occurs.
Signed-off-by: Adam Ward
---
.../devicetree/bindings/regulator/dlg,da9121.yaml | 164 +++--
MAINTAINERS| 2 +
.../dt-bindings/regulator/dlg,da9121-regulator.h | 22 +++
3 files changed, 177 insertions(+), 11 deletions(-)
create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h
diff --git a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
index 2ece46e..6f2164f 100644
--- a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
+++ b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
@@ -7,41 +7,183 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Dialog Semiconductor DA9121 voltage regulator
maintainers:
- - Vincent Whitchurch
+ - Adam Ward
+
+description: |
+ Dialog Semiconductor DA9121 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9122 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9220 Double-channel 3A single-phase buck converter
+ Dialog Semiconductor DA9217 Single-channel 6A double-phase buck converter
+ Dialog Semiconductor DA9130 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9131 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9132 Double-channel 3A single-phase buck converter
+
+ Current limits
+
+ This is PER PHASE, and the current limit setting in the devices reflect
+ that with a maximum 10A limit. Allowing for transients at/near double
+ the rated current, this translates across the device range to per
+ channel figures as so...
+
+ | DA9121DA9122 DA9220DA9217 DA9140
+ | /DA9130 /DA9131/DA9132
+
-
+Output current / channel | 1000 500 300 600
4000
+Output current / phase | 500 500 300 300
950
+
-
+Min regulator-min-microvolt| 30303030
50
+Max regulator-max-microvolt| 190 190 190 190
100
+Device hardware default| 100 100 100 100
100
+
-
+Min regulator-min-microamp | 700 350 350 700
2600
+Max regulator-max-microamp | 2000 1000 600 1200
7800
+Device hardware default| 1500 750 550 1100
5800
properties:
+ $nodename:
+pattern: "pmic@[0-9a-f]{1,2}"
compatible:
-const: dlg,da9121
+enum:
+ - dlg,da9121
+ - dlg,da9122
+ - dlg,da9220
+ - dlg,da9217
+ - dlg,da9130
+ - dlg,da9131
+ - dlg,da9132
+ - dlg,da9140
reg:
maxItems: 1
+description: Specifies the I2C slave address.
+
+ interrupts:
+maxItems: 1
+description: IRQ line information.
+
+ dlg,irq-polling-delay-passive-ms:
+$ref: "/schemas/types.yaml#/definitions/uint32"
+minimum: 1000
+maximum: 1
+description: |
+ Specify the polling period, measured in milliseconds, between interrupt
status
+ update checks. Range 1000-1 ms.
- buck1:
-description:
- Initial data for the Buck1 regulator.
-$ref: "regulator.yaml#"
+ regulators:
type: object
+$ref: regulator.yaml#
+description: |
+ This node defines the settings for the BUCK. The content of the
+ sub-node is defined by the standard binding for regulators; see
regulator.yaml.
+ The DA9121 regulator is bound using their names listed below
+ buck1 - BUCK1
+ buck2 - BUCK2 //DA9122, DA9220, DA9131, DA9132 only
-additionalProperties: false
+patternProperties:
+ "^buck([1-2])$":
+type: object
+$ref: regulator.yaml#
+
+properties:
+ regulator-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
+
+ regulator-initial-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
+
+ enable-gpios:
+maxItems: 1
+
[PATCH V3 00/10] 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 V3: - Restored missing DT bindings patch 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 (10): regulator: Update DA9121 dt-bindings 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 .../devicetree/bindings/regulator/dlg,da9121.yaml | 164 +++- MAINTAINERS|2 + drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 1033 +++- drivers/regulator/da9121-regulator.h | 291 ++ .../dt-bindings/regulator/dlg,da9121-regulator.h | 22 + include/linux/regulator/da9121.h | 36 + 7 files changed, 1513 insertions(+), 49 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h create mode 100644 include/linux/regulator/da9121.h -- 1.9.1
[PATCH V2 7/9] regulator: da9121: add current support
This commit adds support for getting/setting current for all supported
variants. Limits are adjusted per variant to match HW implementation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 113 +++
1 file changed, 113 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 6c82441..a69acb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -91,6 +91,117 @@ struct da9121_variant_info {
{ 1, 2, _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, );
+ 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, );
+ 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[] = {
--
1.9.1
[PATCH V2 8/9] regulator: da9121: add mode support
Adds get/set for mode, and mapping from REGULATOR_MODE_* to select
PFM/PWM/Auto operation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 74
1 file changed, 74 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a69acb2..8e50f55 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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, );
+ 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 = _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 = _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 = _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,
[PATCH V2 3/9] regulator: da9121: Add device variant regmaps
Add ability to probe device and validate configuration, then apply a regmap
configuration for a single or dual buck device accordingly.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index ca908bd..5371709 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -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.
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5bebdb2..137b1df 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -1,5 +1,17 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020 Axis Communications AB */
+//
+// DA9121 Single-channel dual-phase 10A buck converter
+//
+// Copyright (C) 2020 Axis Communications AB
+//
+// 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
#include
#include
@@ -9,26 +21,17 @@
#include
#include
#include
+#include
+
#include "da9121-regulator.h"
/* Chip data */
struct da9121 {
struct device *dev;
+ struct regmap *regmap;
int variant_id;
};
-#define DA9121_MIN_MV 300
-#define DA9121_MAX_MV 1900
-#define DA9121_STEP_MV 10
-#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
-#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
-+ 1 + DA9121_MIN_SEL)
-
-static const struct regmap_config da9121_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-};
-
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -38,6 +41,13 @@ struct da9121 {
.list_voltage = regulator_list_voltage_linear,
};
+#define DA9121_MIN_MV 300
+#define DA9121_MAX_MV 1900
+#define DA9121_STEP_MV 10
+#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
+#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
++ 1 + DA9121_MIN_SEL)
+
static const struct regulator_desc da9121_reg = {
.name = "da9121",
.of_match = "buck1",
@@ -58,6 +68,205 @@ struct da9121 {
.enable_time = 20,
};
+/* 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),
+ regmap_reg_range(DA9121_REG_SYS_CONFIG_2, DA9121_REG_SYS_CONFIG_3),
+ regmap_reg_range(DA9121_REG_SYS_GPIO0_0, DA9121_REG_SYS_GPIO2_1),
+ regmap_reg_range(DA9121_REG_BUCK_BUCK1_0, DA9121_REG_BUCK_BUCK1_6),
+ regmap_reg_range(DA9121_REG_OTP_DEVICE_ID, DA9121_REG_OTP_CONFIG_ID),
+};
+
+static const struct regmap_access_table da9121_1ch_readable_table = {
+ .yes_ranges = da9121_1ch_readable_ranges,
+ .n_yes_ranges = ARRAY_SIZE(da9121_1ch_readable_ranges),
+};
+
+static const struct regmap_range da9121_2ch_readable_ranges[] = {
+ regmap_reg_range(DA9121_REG_SYS_STATUS_0, DA9121_REG_SYS_MASK_3),
+ regmap_reg_range(DA9121_REG_SYS_CO
[PATCH V2 5/9] regulator: da9121: Add support for device variants via devicetree
Add devicetree configuration and device variant parameters. Use the latter
to enable the check and use of parameters specific to dual buck variants.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 119 +++
include/linux/regulator/da9121.h | 11
2 files changed, 130 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index a717e2b..1f74371 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -14,6 +14,7 @@
// Copyright (C) 2020 Dialog Semiconductor
#include
+#include
#include
#include
#include
@@ -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 = 700,
+ .val_max = 2000,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_6A_2phase_current = {
+ .val_min = 700,
+ .val_max = 1200,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 6,
+};
+
+struct da9121_range da9121_5A_1phase_current = {
+ .val_min = 350,
+ .val_max = 1000,
+ .val_stp = 50,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_3A_1phase_current = {
+ .val_min = 350,
+ .val_max = 600,
+ .val_stp = 50,
+ .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, _10A_2phase_current }, //DA9121_TYPE_DA9121_DA9130
+ { 2, 1, _3A_1phase_current }, //DA9121_TYPE_DA9220_DA9132
+ { 2, 1, _5A_1phase_current }, //DA9121_TYPE_DA9122_DA9131
+ { 1, 2, _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", _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",
[PATCH V2 4/9] regulator: da9121: Add device variant descriptors
Descriptors for bucks in all variants, ready for of_regulator_match
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 110 +++
1 file changed, 110 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 137b1df..a717e2b 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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 = _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 = _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 = _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 = _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 = _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 = _buck_ops,
+ .type = REGULATOR_VOLTAGE,
+ .n_voltages = DA9121_N_VOLTAGES,
+ .min_uV = DA9121_MIN_MV * 1000,
+
[PATCH V2 9/9] regulator: da9121: add interrupt support
Adds 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.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 286 +++
1 file changed, 286 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 8e50f55..d9a8a4b 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -23,15 +23,21 @@
#include
#include
#include
+#include
+#include
#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] = { _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++) {
+
[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.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 66bdfd1..c11fe04 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -9,12 +9,7 @@
#include
#include
#include
-
-#define DA9121_BUCK_BUCK1_00x20
-#define DA9121_BUCK_BUCK1_0_CH1_EN BIT(0)
-
-#define DA9121_BUCK_BUCK1_50x25
-#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 = 2,
/* tBUCK_EN */
diff --git a/drivers/regulator/da9121-regulator.h
b/drivers/regulator/da9121-regulator.h
new file mode 100644
index 000..3c34cb8
--- /dev/null
+++ b/drivers/regulator/da9121-regulator.h
@@ -0,0 +1,291 @@
+/* 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: Steve Twiss, Dialog Semiconductor
+ * Adam Ward, Dialog Semiconductor
+ */
+
+#ifndef __DA9121_REGISTERS_H__
+#define __DA9121_REGISTERS_H__
+
+/* Values for: DA9121_REG_BUCK_BUCKx_4 registers, fields CHx_y_MODE
+ * DA9121_REG_BUCK_BUCKx_7 registers, fields CHx_RIPPLE_CANCEL
+ */
+#include
+
+enum da9121_variant {
+ DA9121_TYPE_DA9121_DA9130,
+ DA9121_TYPE_DA9220_DA9132,
+ DA9121_TYPE_DA9122_DA9131,
+ DA9121_TYPE_DA9217
+};
+
+/* Minimum, maximum and default polling millisecond periods are provided
+ * here as an example. It is expected that any final implementation will
+ * include a modification of these settings to match the required
+ * application.
+ */
+#define DA9121_DEFAULT_POLLING_PERIOD_MS 3000
+#define DA9121_MAX_POLLING_PERIOD_MS 1
+#define DA9121_MIN_POLLING_PERIOD_MS 1000
+
+/* Registers */
+
+#define DA9121_REG_SYS_STATUS_00x01
+#define DA9121_REG_SYS_STATUS_10x02
+#define DA9121_REG_SYS_STATUS_20x03
+#define DA9121_REG_SYS_EVENT_0 0x04
+#define DA9121_REG_SYS_EVENT_1 0x05
+#define DA9121_REG_SYS_EVENT_2 0x06
+#define DA9121_REG_SYS_MASK_0 0x07
+#define DA9121_REG_SYS_MASK_1 0x08
+#define DA9121_REG_SYS_MASK_2 0x09
+#define DA9121_REG_SYS_MASK_3 0x0A
+#define DA9121_REG_SYS_CONFIG_00x0B
+#define DA9121_REG_SYS_CONFIG_10x0C
+#define DA9121_REG_SYS_CONFIG_20x0D
+#define DA9121_REG_SYS_CONFIG_30x0E
+#define DA9121_REG_SYS_GPIO0_0 0x10
+#define DA9121_REG_SYS_GPIO0_1 0x11
+#define DA9121_REG_SYS_GPIO1_0 0x12
+#define DA9121_REG_SYS_GPIO1_1 0x13
+#define DA9121_REG_SYS_GPIO2_0 0x14
+#define DA9121_REG_SYS_GPIO2_1 0x15
+#define DA9121_REG_BUCK_BUCK1_00x20
+#define DA9121_REG_BUCK_BUCK1_10x21
+#define DA9121_REG_BUCK_BUCK1_20x22
+#define DA9121_REG_BUCK_BUCK1_30x23
+#define DA9121_REG_BUCK_BUCK1_40x24
+#define DA9121_REG_BUCK_BUCK1_50x25
+#define DA9121_REG_BUCK_BUCK1_60x26
+#define DA9121_REG_BUCK_BUCK1_70x27
+#define DA9xxx_REG_BUCK_BUCK2_00x28
+#define DA9xxx_REG_BUCK_BUCK2_10x29
+#define DA9xxx_REG_BUCK_BUCK2_20x2A
+#define DA9xxx_REG_BUCK_BUCK2_30x2B
+#define DA9xxx_REG_BUCK_BUCK2_4
[PATCH V2 0/9] 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 -- 1.9.1
[PATCH V2 2/9] regulator: da9121: Add device variants
Add basic support for configuration to reference variants of this device,
and track the selected variant within the driver.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 46 +---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index c11fe04..5bebdb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -11,6 +11,12 @@
#include
#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 = >dev;
struct regulator_config config = {};
struct regulator_dev *rdev;
struct regmap *regmap;
+ chip = devm_kzalloc(>dev, sizeof(struct da9121), GFP_KERNEL);
+ if (!chip) {
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ chip->variant_id = da9121_of_get_id(>dev);
+
regmap = devm_regmap_init_i2c(i2c, _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);
--
1.9.1
[PATCH V2 6/9] regulator: da9121: Update registration to support multiple buck variants
Add function which iterates the regulator descriptors for the confirmed
variant ID and registers each buck.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 44 +---
1 file changed, 31 insertions(+), 13 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 1f74371..6c82441 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -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] = { _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, );
+ 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 = >dev;
- struct regulator_config config = {};
- struct regulator_dev *rdev;
chip = devm_kzalloc(>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 = >dev;
- config.driver_data = chip;
- config.of_node = dev->of_node;
- config.regmap = chip->regmap;
-
- rdev = devm_regulator_register(>dev, _reg, );
- if (IS_ERR(rdev)) {
- dev_err(>dev, "Failed to register da9121 regulator\n");
- return PTR_ERR(rdev);
- }
+ ret = da9121_set_regulator_config(chip);
error:
return ret;
--
1.9.1
RE: [PATCH 1/9] regulator: Update DA9121 dt-bindings
> On Fri, Nov 20, 2020 at 02:47:42PM +0100, Vincent Whitchurch wrote: > > On Fri, Nov 20, 2020 at 01:14:50PM +0100, Adam Ward wrote: > Actually, perhaps I'm missing something, but I don't quite see why this > move to a sub-node is needed. There is some flexibility in the > regulator framework for this as I noted earlier > (https://lore.kernel.org/lkml/20201102154848.tm5nsydaukyd7...@axis.com/). > For the case of an MFD it certainly makes sense to have a "regulators" > sub-node but for these chips it seems rather redundant. This sub-node looks fairly well instituted for devices with multiple regulators. There's also the possibility to add GPIO support into another sub-node for all the variants. Mark, do you have a preference?
[PATCH 1/9] regulator: Update DA9121 dt-bindings
Update bindings for the Dialog Semiconductor DA9121 voltage regulator to add
device variants.
Signed-off-by: Adam Ward
---
.../devicetree/bindings/regulator/dlg,da9121.yaml | 177 +++--
MAINTAINERS| 2 +
.../dt-bindings/regulator/dlg,da9121-regulator.h | 22 +++
3 files changed, 185 insertions(+), 16 deletions(-)
create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h
diff --git a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
index cde0d82..1bd177d 100644
--- a/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
+++ b/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
@@ -8,40 +8,185 @@ title: Dialog Semiconductor DA9121 voltage regulator
maintainers:
- Vincent Whitchurch
+ - Adam Ward
+
+description: |
+ Dialog Semiconductor DA9121 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9122 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9220 Double-channel 3A single-phase buck converter
+ Dialog Semiconductor DA9217 Single-channel 6A double-phase buck converter
+ Dialog Semiconductor DA9130 Single-channel 10A double-phase buck converter
+ Dialog Semiconductor DA9131 Double-channel 5A single-phase buck converter
+ Dialog Semiconductor DA9132 Double-channel 3A single-phase buck converter
+
+ Current limits
+
+ This is PER PHASE, and the current limit setting in the devices reflect
+ that with a maximum 10A limit. Allowing for transients at/near double
+ the rated current, this translates across the device range to per
+ channel figures as so...
+
+ | DA9121DA9122 DA9220DA9217 DA9140
+ | /DA9130 /DA9131/DA9132
+
-
+Output current / channel | 1000 500 300 600
4000
+Output current / phase | 500 500 300 300
950
+
-
+Min regulator-min-microvolt| 30303030
50
+Max regulator-max-microvolt| 190 190 190 190
100
+Device hardware default| 100 100 100 100
100
+
-
+Min regulator-min-microamp | 700 350 350 700
2600
+Max regulator-max-microamp | 2000 1000 600 1200
7800
+Device hardware default| 1500 750 550 1100
5800
properties:
+ $nodename:
+pattern: "pmic@[0-9a-f]{1,2}"
compatible:
-const: dlg,da9121
+enum:
+ - dlg,da9121
+ - dlg,da9122
+ - dlg,da9220
+ - dlg,da9217
+ - dlg,da9130
+ - dlg,da9131
+ - dlg,da9132
+ - dlg,da9140
reg:
maxItems: 1
+description: Specifies the I2C slave address.
- buck1:
-description:
- Initial data for the Buck1 regulator.
-$ref: "regulator.yaml#"
+ interrupt-parent:
+maxItems: 1
+description: Specifies the reference to the interrupt controller.
+
+ interrupts:
+maxItems: 1
+description: IRQ line information.
+
+ dlg,irq-polling-delay-passive:
+maxItems: 1
+description: |
+ Specify the polling period, measured in milliseconds, between interrupt
status
+ update checks. Range 1000-1 ms.
+
+ regulators:
type: object
+$ref: regulator.yaml#
+description: |
+ This node defines the settings for the BUCK. The content of the
+ sub-node is defined by the standard binding for regulators; see
regulator.yaml.
+ The DA9121 regulator is bound using their names listed below
+ buck1 - BUCK1
+ buck2 - BUCK2 //DA9122, DA9220, DA9131, DA9132 only
+
+patternProperties:
+ "^buck([0-1])$":
+type: object
+$ref: regulator.yaml#
+
+properties:
+ regulator-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
+
+ regulator-initial-mode:
+maxItems: 1
+description: Defined in
include/dt-bindings/regulator/dlg,da9121-regulator.h
-unevaluatedProperties: false
+ enable-gpios:
+maxItems: 1
+description: Specify a valid GPIO for platform control of the regulator
+
+ dlg,ripple-cancel:
+maxItems: 1
+description: |
+ Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h
+ Only present on multi-channel devices (DA9122, DA9220, DA9131,
DA9132)
+
+additionalProperties: false
required:
- compatible
- reg
+ - regulators
+
+additionalProperties: false
examples:
- |
+#include
+#in
[PATCH 9/9] regulator: da9121: add interrupt support
Adds interrupt handler for variants, and notifications for events; over
temperature/voltage/current.
Also handling of persistent events and respective timing configuration.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 548 +++
1 file changed, 548 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 3addbd2..37a767e 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -24,15 +24,22 @@
#include
#include
#include
+#include
+#include
#include "da9121-regulator.h"
/* Chip data */
struct da9121 {
struct device *dev;
+ struct delayed_work work;
+ struct regmap *regmap;
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;
};
@@ -92,6 +99,104 @@ struct da9121_variant_info {
{ 1, 2, _6A_2phase_current }, //DA9121_TYPE_DA9217
};
+static void da9121_status_poll_on(struct work_struct *work)
+{
+ struct da9121 *chip = container_of(work, struct da9121, work.work);
+ enum { R0 = 0, R1, R2, REG_MAX_NUM };
+ int status[REG_MAX_NUM] = {0};
+ int clear[REG_MAX_NUM] = {0};
+ unsigned long delay;
+ int i;
+ int ret;
+
+ /* If persistent-notification, status will be true
+* If not persistent-notification any longer, status will be false
+*/
+ ret = regmap_bulk_read(chip->regmap, DA9121_REG_SYS_STATUS_0,
+ (void *)status, (size_t)REG_MAX_NUM);
+ if (ret < 0) {
+ dev_err(chip->dev,
+ "Failed to read STATUS registers: %d\n", ret);
+ goto error;
+ }
+
+ /* 0 TEMP_CRIT */
+ if ((chip->persistent[R0] & DA9121_MASK_SYS_EVENT_0_E_TEMP_CRIT) &&
+ !(status[R0] & DA9121_MASK_SYS_STATUS_0_TEMP_CRIT)) {
+ clear[R0] |= DA9121_MASK_SYS_MASK_0_M_TEMP_CRIT;
+ chip->persistent[R0] &= ~DA9121_MASK_SYS_EVENT_0_E_TEMP_CRIT;
+ }
+ /* 0 TEMP_WARN */
+ if ((chip->persistent[R0] & DA9121_MASK_SYS_EVENT_0_E_TEMP_WARN) &&
+ !(status[R0] & DA9121_MASK_SYS_STATUS_0_TEMP_WARN)) {
+ clear[R0] |= DA9121_MASK_SYS_MASK_0_M_TEMP_WARN;
+ chip->persistent[R0] &= ~DA9121_MASK_SYS_EVENT_0_E_TEMP_WARN;
+ }
+
+ /* 1 OV1 */
+ if ((chip->persistent[R1] & DA9121_MASK_SYS_EVENT_1_E_OV1) &&
+ !(status[R1] & DA9121_MASK_SYS_STATUS_1_OV1)) {
+ clear[R1] |= DA9121_MASK_SYS_MASK_1_M_OV1;
+ chip->persistent[R1] &= ~DA9121_MASK_SYS_EVENT_1_E_OV1;
+ }
+ /* 1 UV1 */
+ if ((chip->persistent[R1] & DA9121_MASK_SYS_EVENT_1_E_UV1) &&
+ !(status[R1] & DA9121_MASK_SYS_STATUS_1_UV1)) {
+ clear[R1] |= DA9121_MASK_SYS_MASK_1_M_UV1;
+ chip->persistent[R1] &= ~DA9121_MASK_SYS_EVENT_1_E_UV1;
+ }
+ /* 1 OC1 */
+ if ((chip->persistent[R1] & DA9121_MASK_SYS_EVENT_1_E_OC1) &&
+ !(status[R1] & DA9121_MASK_SYS_STATUS_1_OC1)) {
+ clear[R1] |= DA9121_MASK_SYS_MASK_1_M_OC1;
+ chip->persistent[R1] &= ~DA9121_MASK_SYS_EVENT_1_E_OC1;
+ }
+
+ if (variant_parameters[chip->variant_id].num_bucks == 2) {
+ /* 1 OV2 */
+ if ((chip->persistent[R1] & DA9xxx_MASK_SYS_EVENT_1_E_OV2) &&
+ !(status[R1] & DA9xxx_MASK_SYS_STATUS_1_OV2)) {
+ clear[R1] |= DA9xxx_MASK_SYS_MASK_1_M_OV2;
+ chip->persistent[R1] &= ~DA9xxx_MASK_SYS_EVENT_1_E_OV2;
+ }
+ /* 1 UV2 */
+ if ((chip->persistent[R1] & DA9xxx_MASK_SYS_EVENT_1_E_UV2) &&
+ !(status[R1] & DA9xxx_MASK_SYS_STATUS_1_UV2)) {
+ clear[R1] |= DA9xxx_MASK_SYS_MASK_1_M_UV2;
+ chip->persistent[R1] &= ~DA9xxx_MASK_SYS_EVENT_1_E_UV2;
+ }
+ /* 1 OC2 */
+ if ((chip->persistent[R1] & DA9xxx_MASK_SYS_EVENT_1_E_OC2) &&
+ !(status[R1] & DA9xxx_MASK_SYS_STATUS_1_OC2)) {
+ clear[R1] |= DA9xxx_MASK_SYS_MASK_1_M_OC2;
+ chip->persistent[R1] &= ~DA9xxx_MASK_SYS_EVENT_1_E_OC2;
+ }
+ }
+
+ for (i = R0; i < REG_MAX_NUM-1; i++) {
+ if (clear[i]) {
+ unsigned int reg = DA9121_REG_SYS_MASK_0 + i;
+ unsigned int mbit = clear[
[PATCH 4/9] regulator: da9121: Add device variant details and respective regmaps
Add ability to probe device and validate configuration, then apply a regmap
configuration for a single or dual buck device accordingly.
Signed-off-by: Adam Ward
---
drivers/regulator/Kconfig| 14 +-
drivers/regulator/da9121-regulator.c | 382 +--
include/linux/regulator/da9121.h | 25 +++
3 files changed, 401 insertions(+), 20 deletions(-)
create mode 100644 include/linux/regulator/da9121.h
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 005a603..68f1bbd 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -304,13 +304,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.
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5bebdb2..76932ba 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -9,26 +9,18 @@
#include
#include
#include
+#include
+
#include "da9121-regulator.h"
/* Chip data */
struct da9121 {
struct device *dev;
+ struct regmap *regmap;
+ struct regulator_dev *rdev[DA9121_IDX_MAX];
int variant_id;
};
-#define DA9121_MIN_MV 300
-#define DA9121_MAX_MV 1900
-#define DA9121_STEP_MV 10
-#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
-#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
-+ 1 + DA9121_MIN_SEL)
-
-static const struct regmap_config da9121_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-};
-
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -38,10 +30,24 @@ 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
+#define DA9121_MIN_SEL (DA9121_MIN_MV / DA9121_STEP_MV)
+#define DA9121_N_VOLTAGES (((DA9121_MAX_MV - DA9121_MIN_MV) /
DA9121_STEP_MV) \
++ 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 = _buck_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = DA9121_N_VOLTAGES,
@@ -58,6 +64,349 @@ 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 = _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_n
[PATCH 6/9] regulator: da9121: Update registration to support multiple buck variants
Checks DT matches tally with variant maximum and register accordingly.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 81 +++-
1 file changed, 70 insertions(+), 11 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5020774..13b0aad 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -314,6 +314,69 @@ static struct da9121_pdata
*da9121_parse_regulators_dt(struct da9121 *chip)
}
#endif
+static int da9121_set_regulator_config(struct da9121 *chip)
+{
+ struct regulator_config config = { };
+ unsigned int max_matches = chip->pdata->num_buck;
+ int ret = 0;
+ int i;
+
+ if (max_matches > variant_parameters[chip->variant_id].num_bucks) {
+ dev_err(chip->dev, "Too many regulators in the DT\n");
+ ret = -EINVAL;
+ goto error;
+ }
+
+ for (i = 0; i < max_matches; i++) {
+ const struct regulator_desc *regl_desc =
+ local_da9121_regulators[chip->variant_id][i];
+ int id = regl_desc->id;
+ struct gpio_desc *gpio_ren;
+
+ if (chip->pdata->gpiod_ren[i])
+ gpio_ren = chip->pdata->gpiod_ren[i];
+ else
+ gpio_ren = NULL;
+
+ config.init_data = chip->pdata->init_data[i];
+ config.dev = chip->dev;
+ config.driver_data = chip;
+ config.regmap = chip->regmap;
+ config.of_node = chip->pdata->reg_node[i];
+
+ switch (id) {
+ case DA9121_IDX_BUCK1:
+ case DA9121_IDX_BUCK2:
+ config.ena_gpiod = gpio_ren;
+ break;
+ default:
+ dev_err(chip->dev, "Invalid regulator ID\n");
+ ret = -EINVAL;
+ goto error;
+ }
+
+ /*
+* Hand the GPIO descriptor management over to the regulator
+* core, remove it from GPIO devres management.
+*/
+ if (config.ena_gpiod)
+ devm_gpiod_unhinge(chip->dev, config.ena_gpiod);
+
+ chip->rdev[i] = devm_regulator_register(chip->dev,
+ regl_desc,
+ );
+ if (IS_ERR(chip->rdev[i])) {
+ dev_err(chip->dev, "Failed to register regulator %s,
%d/%d of_map_mode:%p\n",
+ regl_desc->name, (i+1), max_matches,
regl_desc->of_map_mode);
+ 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),
@@ -586,9 +649,6 @@ static int da9121_i2c_probe(struct i2c_client *i2c,
{
struct da9121 *chip;
int ret = 0;
- struct device *dev = >dev;
- struct regulator_config config = {};
- struct regulator_dev *rdev;
chip = devm_kzalloc(>dev, sizeof(struct da9121), GFP_KERNEL);
if (!chip) {
@@ -606,16 +666,15 @@ static int da9121_i2c_probe(struct i2c_client *i2c,
if (!chip->pdata)
chip->pdata = da9121_parse_regulators_dt(chip);
- config.dev = >dev;
- config.of_node = dev->of_node;
- config.regmap = chip->regmap;
-
- rdev = devm_regulator_register(>dev, _reg, );
- if (IS_ERR(rdev)) {
- dev_err(>dev, "Failed to register da9121 regulator\n");
- return PTR_ERR(rdev);
+ if (IS_ERR(chip->pdata)) {
+ dev_err(chip->dev, "No regulators defined for the platform\n");
+ return PTR_ERR(chip->pdata);
}
+ ret = da9121_set_regulator_config(chip);
+ if (ret < 0)
+ goto error;
+
error:
return ret;
}
--
1.9.1
[PATCH 2/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
replacee local defines with those from header.
Signed-off-by: Adam Ward
---
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
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 66bdfd1..c11fe04 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -9,12 +9,7 @@
#include
#include
#include
-
-#define DA9121_BUCK_BUCK1_00x20
-#define DA9121_BUCK_BUCK1_0_CH1_EN BIT(0)
-
-#define DA9121_BUCK_BUCK1_50x25
-#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 = 2,
/* tBUCK_EN */
diff --git a/drivers/regulator/da9121-regulator.h
b/drivers/regulator/da9121-regulator.h
new file mode 100644
index 000..3c34cb8
--- /dev/null
+++ b/drivers/regulator/da9121-regulator.h
@@ -0,0 +1,291 @@
+/* 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: Steve Twiss, Dialog Semiconductor
+ * Adam Ward, Dialog Semiconductor
+ */
+
+#ifndef __DA9121_REGISTERS_H__
+#define __DA9121_REGISTERS_H__
+
+/* Values for: DA9121_REG_BUCK_BUCKx_4 registers, fields CHx_y_MODE
+ * DA9121_REG_BUCK_BUCKx_7 registers, fields CHx_RIPPLE_CANCEL
+ */
+#include
+
+enum da9121_variant {
+ DA9121_TYPE_DA9121_DA9130,
+ DA9121_TYPE_DA9220_DA9132,
+ DA9121_TYPE_DA9122_DA9131,
+ DA9121_TYPE_DA9217
+};
+
+/* Minimum, maximum and default polling millisecond periods are provided
+ * here as an example. It is expected that any final implementation will
+ * include a modification of these settings to match the required
+ * application.
+ */
+#define DA9121_DEFAULT_POLLING_PERIOD_MS 3000
+#define DA9121_MAX_POLLING_PERIOD_MS 1
+#define DA9121_MIN_POLLING_PERIOD_MS 1000
+
+/* Registers */
+
+#define DA9121_REG_SYS_STATUS_00x01
+#define DA9121_REG_SYS_STATUS_10x02
+#define DA9121_REG_SYS_STATUS_20x03
+#define DA9121_REG_SYS_EVENT_0 0x04
+#define DA9121_REG_SYS_EVENT_1 0x05
+#define DA9121_REG_SYS_EVENT_2 0x06
+#define DA9121_REG_SYS_MASK_0 0x07
+#define DA9121_REG_SYS_MASK_1 0x08
+#define DA9121_REG_SYS_MASK_2 0x09
+#define DA9121_REG_SYS_MASK_3 0x0A
+#define DA9121_REG_SYS_CONFIG_00x0B
+#define DA9121_REG_SYS_CONFIG_10x0C
+#define DA9121_REG_SYS_CONFIG_20x0D
+#define DA9121_REG_SYS_CONFIG_30x0E
+#define DA9121_REG_SYS_GPIO0_0 0x10
+#define DA9121_REG_SYS_GPIO0_1 0x11
+#define DA9121_REG_SYS_GPIO1_0 0x12
+#define DA9121_REG_SYS_GPIO1_1 0x13
+#define DA9121_REG_SYS_GPIO2_0 0x14
+#define DA9121_REG_SYS_GPIO2_1 0x15
+#define DA9121_REG_BUCK_BUCK1_00x20
+#define DA9121_REG_BUCK_BUCK1_10x21
+#define DA9121_REG_BUCK_BUCK1_20x22
+#define DA9121_REG_BUCK_BUCK1_30x23
+#define DA9121_REG_BUCK_BUCK1_40x24
+#define DA9121_REG_BUCK_BUCK1_50x25
+#define DA9121_REG_BUCK_BUCK1_60x26
+#define DA9121_REG_BUCK_BUCK1_70x27
+#define DA9xxx_REG_BUCK_BUCK2_00x28
+#define DA9xxx_REG_BUCK_BUCK2_10x29
+#define DA9xxx_REG_BUCK_BUCK2_20x2A
+#define DA9xxx_REG_BUCK_BUCK2_30x2B
+#define DA9xxx_REG_BUCK_BUCK2_4
[PATCH 7/9] regulator: da9121: add current support
This commit adds support for getting/setting current for all supported
variants. Limits are adjusted per variant to match HW implementation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 140 +++
1 file changed, 140 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 13b0aad..5d11c22 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -92,6 +92,144 @@ struct da9121_variant_info {
{ 1, 2, _6A_2phase_current }, //DA9121_TYPE_DA9217
};
+static bool da9121_rdev_to_buck_reg_mask(struct regulator_dev *rdev, bool mode,
+unsigned int *reg, unsigned int *msk)
+{
+ struct da9121 *chip = rdev_get_drvdata(rdev);
+ int id = rdev_get_id(rdev);
+
+ switch (id) {
+ case DA9121_IDX_BUCK1:
+ if (mode) {
+ *reg = DA9121_REG_BUCK_BUCK1_4;
+ *msk = DA9121_MASK_BUCK_BUCKx_4_CHx_A_MODE;
+ } else {
+ *reg = DA9121_REG_BUCK_BUCK1_2;
+ *msk = DA9121_MASK_BUCK_BUCKx_2_CHx_ILIM;
+ }
+ break;
+ case DA9121_IDX_BUCK2:
+ if (mode) {
+ *reg = DA9xxx_REG_BUCK_BUCK2_4;
+ *msk = DA9121_MASK_BUCK_BUCKx_4_CHx_A_MODE;
+ } else {
+ *reg = DA9xxx_REG_BUCK_BUCK2_2;
+ *msk = DA9121_MASK_BUCK_BUCKx_2_CHx_ILIM;
+ }
+ break;
+ default:
+ dev_err(chip->dev, "Invalid regulator ID\n");
+ return false;
+ }
+ return true;
+}
+
+static int da9121_get_current_limit(struct regulator_dev *rdev)
+{
+ struct da9121 *chip = rdev_get_drvdata(rdev);
+ struct da9121_range *range =
+ variant_parameters[chip->variant_id].current_range;
+ unsigned int reg = 0;
+ unsigned int msk = 0;
+ unsigned int val = 0;
+ int ret = 0;
+
+ if (!da9121_rdev_to_buck_reg_mask(rdev, false, , ))
+ return -EINVAL;
+
+ ret = regmap_read(chip->regmap, reg, );
+ 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);
+ struct da9121_range *range =
+ variant_parameters[chip->variant_id].current_range;
+ unsigned int sel = 0;
+ unsigned int reg = 0;
+ unsigned int msk = 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, );
+ if (ret < 0)
+ goto error;
+
+ if (!da9121_rdev_to_buck_reg_mask(rdev, false, , ))
+ return -EINVAL;
+
+ ret = regmap_update_bits(chip->regmap, reg, msk, (unsigned int)sel);
+ if (ret < 0)
+ dev_err(chip->dev, "Cannot update BUCK register %02x, err:
%d\n", reg,
[PATCH 8/9] regulator: da9121: add mode support
Adds get/set for mode, and mapping from REGULATOR_MODE_* to select
PFM/PWM/Auto operation.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 74
1 file changed, 74 insertions(+)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 5d11c22..3addbd2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -230,6 +230,72 @@ 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);
+ unsigned int val;
+ unsigned int reg;
+ unsigned int msk;
+
+ 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;
+ }
+
+ if (!da9121_rdev_to_buck_reg_mask(rdev, true, , ))
+ return -EINVAL;
+
+ return regmap_update_bits(chip->regmap, reg, msk, val);
+}
+
+static unsigned int da9121_buck_get_mode(struct regulator_dev *rdev)
+{
+ struct da9121 *chip = rdev_get_drvdata(rdev);
+ unsigned int reg;
+ unsigned int msk;
+ unsigned int val;
+ int ret = 0;
+
+ if (!da9121_rdev_to_buck_reg_mask(rdev, true, , ))
+ return -EINVAL;
+
+ ret = regmap_read(chip->regmap, reg, );
+ if (ret < 0) {
+ dev_err(chip->dev, "Cannot read BUCK register: %d\n", ret);
+ return -EINVAL;
+ }
+
+ return da9121_map_mode(val & msk);
+}
+
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -239,6 +305,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[] = {
@@ -258,6 +326,7 @@ static int da9121_set_current_limit(struct regulator_dev
*rdev,
.name = "da9121",
.of_match = "buck1",
.owner = THIS_MODULE,
+ .of_map_mode = da9121_map_mode,
.regulators_node = of_match_ptr("regulators"),
.ops = _buck_ops,
.type = REGULATOR_VOLTAGE,
@@ -281,6 +350,7 @@ static int da9121_set_current_limit(struct regulator_dev
*rdev,
.name = "DA9220/DA9132 BUCK1",
.of_match = "buck1",
.owner = THIS_MODULE,
+ .of_map_mode = da9121_map_mode,
.regulators_node = of_match_ptr("regulators"),
.ops = _buck_ops,
.type = REGULATOR_VOLTAGE,
@@ -298,6 +368,7 @@ static int da9121_set_current_limit(struct regulator_dev
*rdev,
.name = "DA9220/DA9132 BUCK2",
.of_match = "buck2",
.owner = THIS_MODULE,
+ .of_map_mode = da9121_map_mode,
.regulators_node = of_match_ptr("regulators"),
.ops = _buck_ops,
.type = REGULATOR_VOLTAGE,
@@ -318,6 +389,7 @@ static int da9121_set_current_limit(struct regulator_dev
*rdev,
.name = "DA9122/DA9131 BUCK1",
.of_match = "buck1",
.owner = THIS_MODULE,
+ .of_map_mode = da9121_map_mode,
.regulators_node = of_match_ptr("regulators"),
.ops = _buck_ops,
.type = REGULATOR_VOLTAGE,
@@ -335,6 +407,7 @@ static int da9121_set_current_limit(struct regulator_dev
*rdev,
.name = "DA9122/DA9131 BUCK2",
.of_match = "buck2",
.owner = THIS_MODULE,
+ .of_map_mode = da9121_map_mode,
[PATCH 0/9] regulator: da9121: extend support to variants, add features
s series extends the DA9121 driver to add support for related products: DA9130, a High-Performance, 10A, Dual-Phase > DC-DC Converter (Automotive Grade) DA9122, a High-Performance, 5A + 5A, Dual-Channel > DC-DC Converter DA9131, a High-Performance, 5A + 5A, Dual-Channel > DC-DC Converter (Automotive Grade) DA9220, a High-Performance, 3A + 3A, Dual-Channel > DC-DC Converter DA9132, a High-Performance, 3A + 3A, Dual-Channel > DC-DC Converter (Automotive Grade) DA9217, a High-Performance, 6A, Dual-Phase > DC-DC Converter 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 Adam Ward (9): regulator: Update DA9121 dt-bindings regulator: da9121: Add header file regulator: da9121: Add device variants regulator: da9121: Add device variant details and respective regmaps 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 .../devicetree/bindings/regulator/dlg,da9121.yaml | 177 ++- MAINTAINERS|2 + drivers/regulator/Kconfig | 14 +- drivers/regulator/da9121-regulator.c | 1429 +++- drivers/regulator/da9121-regulator.h | 291 .../dt-bindings/regulator/dlg,da9121-regulator.h | 22 + include/linux/regulator/da9121.h | 36 + 7 files changed, 1917 insertions(+), 54 deletions(-) create mode 100644 drivers/regulator/da9121-regulator.h create mode 100644 include/dt-bindings/regulator/dlg,da9121-regulator.h create mode 100644 include/linux/regulator/da9121.h -- 1.9.1
[PATCH 3/9] regulator: da9121: Add device variants
Add basic support for configuration to reference variants of this device,
and track the selected variant within the driver.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 46 +---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index c11fe04..5bebdb2 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -11,6 +11,12 @@
#include
#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 = >dev;
struct regulator_config config = {};
struct regulator_dev *rdev;
struct regmap *regmap;
+ chip = devm_kzalloc(>dev, sizeof(struct da9121), GFP_KERNEL);
+ if (!chip) {
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ chip->variant_id = da9121_of_get_id(>dev);
+
regmap = devm_regmap_init_i2c(i2c, _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);
--
1.9.1
[PATCH 5/9] regulator: da9121: Add support for device variants via devicetree
Add devicetree configuration and device variant parameters. Use the latter to
enable the check and use of parameters specific to dual buck variants.
Signed-off-by: Adam Ward
---
drivers/regulator/da9121-regulator.c | 157 ++-
include/linux/regulator/da9121.h | 11 +++
2 files changed, 167 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/da9121-regulator.c
b/drivers/regulator/da9121-regulator.c
index 76932ba..5020774 100644
--- a/drivers/regulator/da9121-regulator.c
+++ b/drivers/regulator/da9121-regulator.c
@@ -1,7 +1,21 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020 Axis Communications AB */
+/* Copyright (C) 2020 Axis Communications AB
+ *
+ * DA9121 Single-channel dual-phase 10A buck converter
+ *
+ * Copyright (C) 2020 Dialog Semiconductor
+ *
+ * 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)
+ *
+ */
#include
+#include
#include
#include
#include
@@ -16,11 +30,68 @@
/* Chip data */
struct da9121 {
struct device *dev;
+ struct da9121_pdata *pdata;
struct regmap *regmap;
struct regulator_dev *rdev[DA9121_IDX_MAX];
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 = 700,
+ .val_max = 2000,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_6A_2phase_current = {
+ .val_min = 700,
+ .val_max = 1200,
+ .val_stp = 100,
+ .reg_min = 1,
+ .reg_max = 6,
+};
+
+struct da9121_range da9121_5A_1phase_current = {
+ .val_min = 350,
+ .val_max = 1000,
+ .val_stp = 50,
+ .reg_min = 1,
+ .reg_max = 14,
+};
+
+struct da9121_range da9121_3A_1phase_current = {
+ .val_min = 350,
+ .val_max = 600,
+ .val_stp = 50,
+ .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, _10A_2phase_current }, //DA9121_TYPE_DA9121_DA9130
+ { 2, 1, _3A_1phase_current }, //DA9121_TYPE_DA9220_DA9132
+ { 2, 1, _5A_1phase_current }, //DA9121_TYPE_DA9122_DA9131
+ { 1, 2, _6A_2phase_current }, //DA9121_TYPE_DA9217
+};
+
static const struct regulator_ops da9121_buck_ops = {
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
@@ -163,6 +234,86 @@ struct da9121 {
[DA9121_TYPE_DA9217] = { _reg, NULL },
};
+#ifdef CONFIG_OF
+static struct da9121_pdata *da9121_parse_regulators_dt(struct da9121 *chip)
+{
+ struct da9121_pdata *pdata;
+ struct device_node *node;
+ int num = 0;
+ int ret = 0;
+ int i, n;
+ enum gpiod_flags flags = GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE;
+
+ node = of_get_child_by_name(chip->dev->of_node, "regulators");
+ if (!node) {
+ dev_err(chip->dev, "Regulators node not found\n");
+ return ERR_PTR(-ENODEV);
+ }
+
+ num = of_regulator_match(chip->dev, node, da9121_matches,
+ARRAY_SIZE(da9121_matches));
+ of_node_put(node);
+ if (num < 0) {
+ dev_err(chip->dev, "Failed to match regulators\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ /* interrupt assumptions require at least one buck to be configured */
+ if (num == 0) {
+ dev_err(chip->dev, "Did not match any regulators in the DT\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ pdata = devm_kzalloc(chip->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata)
+ return ERR_PTR(-ENOMEM);
+
+ pdata->num_buck = num;
+
+ n = 0;
+ for (i = 0; i < ARRAY_SIZE(da9121_matches); i++) {
+ if (!da9121_matches[i].init_data)
+ continue;
+
+ pdata->init_data[n] = da9121_matches[i].init_data;
+ pdata->reg_node[n] = da9121_matches[i].of_node;
+ pdata->gpiod_ren[n] = devm_gpiod_get_from_of_node(chip->dev,
+ da9121_matches[i].of_node,
+ "
[PATCH v1 1/2] mfd: da9052: Fix register access via SPI
The range of registers used by this driver exceeds that available
via SPI with no paging (127), so we have to override the values
from the default config which is set-up for I2C access.
Also change SPI settings to match device's recommended OTP values.
Signed-off-by: Adam Ward
Tested-by: Adam Ward
---
drivers/mfd/da9052-spi.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index 45ae0b7..b5de8a6 100644
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -32,7 +32,7 @@ static int da9052_spi_probe(struct spi_device *spi)
if (!da9052)
return -ENOMEM;
- spi->mode = SPI_MODE_0 | SPI_CPOL;
+ spi->mode = SPI_MODE_0;
spi->bits_per_word = 8;
spi_setup(spi);
@@ -43,6 +43,10 @@ static int da9052_spi_probe(struct spi_device *spi)
config = da9052_regmap_config;
config.read_flag_mask = 1;
+ config.reg_bits = 7;
+ config.pad_bits = 1;
+ config.val_bits = 8;
+ config.use_single_rw = 1;
da9052->regmap = devm_regmap_init_spi(spi, );
if (IS_ERR(da9052->regmap)) {
--
end-of-patch for mfd: da9052: Fix SPI access and IRQ config
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 2/2] mfd: da9052: Register ability of device to cause a wake-up interrupt
Signed-off-by: Adam Ward Tested-by: Adam Ward --- drivers/mfd/da9052-irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mfd/da9052-irq.c b/drivers/mfd/da9052-irq.c index 57ae784..e65ca19 100644 --- a/drivers/mfd/da9052-irq.c +++ b/drivers/mfd/da9052-irq.c @@ -262,6 +262,8 @@ int da9052_irq_init(struct da9052 *da9052) goto regmap_err; } + enable_irq_wake(da9052->chip_irq); + ret = da9052_request_irq(da9052, DA9052_IRQ_ADC_EOM, "adc-irq", da9052_auxadc_irq, da9052); -- end-of-patch for mfd: da9052: Fix SPI access and IRQ config -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 2/3] rtc: da9052: Add constraints to set valid year
Signed-off-by: Adam Ward Tested-by: Adam Ward --- drivers/rtc/rtc-da9052.c | 8 1 file changed, 8 insertions(+) diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index ead02fa..acc3e5a 100644 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c @@ -206,6 +206,10 @@ static int da9052_rtc_set_time(struct device *dev, struct rtc_time *tm) uint8_t v[6]; int ret; + /* DA9052 only has 6 bits for year - to represent 2000-2063 */ + if ((tm->tm_year < 100) || (tm->tm_year > 163)) + return -EINVAL; + rtc = dev_get_drvdata(dev); v[0] = tm->tm_sec; @@ -243,6 +247,10 @@ static int da9052_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) struct rtc_time *tm = >time; struct da9052_rtc *rtc = dev_get_drvdata(dev); + /* DA9052 only has 6 bits for year - to represent 2000-2063 */ + if ((tm->tm_year < 100) || (tm->tm_year > 163)) + return -EINVAL; + ret = da9052_rtc_enable_alarm(rtc, 0); if (ret < 0) return ret; -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 3/3] rtc: da9052: Register ability of alarm to wake device from suspend
Signed-off-by: Adam Ward Tested-by: Adam Ward --- drivers/rtc/rtc-da9052.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index acc3e5a..1ba4371 100644 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c @@ -309,6 +309,8 @@ static int da9052_rtc_probe(struct platform_device *pdev) return ret; } + device_init_wakeup(>dev, true); + rtc->rtc = devm_rtc_device_register(>dev, pdev->name, _rtc_ops, THIS_MODULE); return PTR_ERR_OR_ZERO(rtc->rtc); -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 0/3] rtc: da9052: Corrections to access, validation and capability
Hi, This patch set is based on mainline v4.0-rc2. It makes corrections to restrict the year setting to the range defined for the device to support. It also prevents erroneous values being returned, as was discovered possible when reading a time immediately after setting it. And lastly, it enables the wake-from-suspend capability. Best regards, Adam Adam Ward (3): rtc: da9052: Add extra reads with timeouts to avoid returning partially updated values rtc: da9052: Add constraints to set valid year rtc: da9052: Register ability of alarm to wake device from suspend drivers/rtc/rtc-da9052.c | 97 +--- 1 file changed, 76 insertions(+), 21 deletions(-) -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 1/3] rtc: da9052: Add extra reads with timeouts to avoid returning partially updated values
The RTC is in a different clock domain so a quick read after write
can retrieve a mangled value of the old/new values
Signed-off-by: Adam Ward
Tested-by: Adam Ward
---
drivers/rtc/rtc-da9052.c | 87
1 file changed, 66 insertions(+), 21 deletions(-)
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 613c43b..ead02fa 100644
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
#include
@@ -23,6 +24,8 @@
#define rtc_err(rtc, fmt, ...) \
dev_err(rtc->da9052->dev, "%s: " fmt, __func__, ##__VA_ARGS__)
+#define DA9052_GET_TIME_RETRIES 5
+
struct da9052_rtc {
struct rtc_device *rtc;
struct da9052 *da9052;
@@ -58,22 +61,43 @@ static irqreturn_t da9052_rtc_irq(int irq, void *data)
static int da9052_read_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
{
int ret;
- uint8_t v[5];
+ uint8_t v[2][5];
+ int idx = 1;
+ int timeout = DA9052_GET_TIME_RETRIES;
- ret = da9052_group_read(rtc->da9052, DA9052_ALARM_MI_REG, 5, v);
- if (ret != 0) {
+ ret = da9052_group_read(rtc->da9052, DA9052_ALARM_MI_REG, 5, [0][0]);
+ if (ret) {
rtc_err(rtc, "Failed to group read ALM: %d\n", ret);
return ret;
}
- rtc_tm->tm_year = (v[4] & DA9052_RTC_YEAR) + 100;
- rtc_tm->tm_mon = (v[3] & DA9052_RTC_MONTH) - 1;
- rtc_tm->tm_mday = v[2] & DA9052_RTC_DAY;
- rtc_tm->tm_hour = v[1] & DA9052_RTC_HOUR;
- rtc_tm->tm_min = v[0] & DA9052_RTC_MIN;
+ do {
+ ret = da9052_group_read(rtc->da9052,
+ DA9052_ALARM_MI_REG, 5, [idx][0]);
+ if (ret) {
+ rtc_err(rtc, "Failed to group read ALM: %d\n", ret);
+ return ret;
+ }
- ret = rtc_valid_tm(rtc_tm);
- return ret;
+ if (memcmp([0][0], [1][0], 5) == 0) {
+ rtc_tm->tm_year = (v[0][4] & DA9052_RTC_YEAR) + 100;
+ rtc_tm->tm_mon = (v[0][3] & DA9052_RTC_MONTH) - 1;
+ rtc_tm->tm_mday = v[0][2] & DA9052_RTC_DAY;
+ rtc_tm->tm_hour = v[0][1] & DA9052_RTC_HOUR;
+ rtc_tm->tm_min = v[0][0] & DA9052_RTC_MIN;
+
+ ret = rtc_valid_tm(rtc_tm);
+ return ret;
+ }
+
+ idx = (1-idx);
+ msleep(20);
+
+ } while (timeout--);
+
+ rtc_err(rtc, "Timed out reading alarm time\n");
+
+ return -EIO;
}
static int da9052_set_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
@@ -135,24 +159,45 @@ static int da9052_rtc_get_alarm_status(struct da9052_rtc
*rtc)
static int da9052_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
{
struct da9052_rtc *rtc = dev_get_drvdata(dev);
- uint8_t v[6];
int ret;
+ uint8_t v[2][6];
+ int idx = 1;
+ int timeout = DA9052_GET_TIME_RETRIES;
- ret = da9052_group_read(rtc->da9052, DA9052_COUNT_S_REG, 6, v);
- if (ret < 0) {
+ ret = da9052_group_read(rtc->da9052, DA9052_COUNT_S_REG, 6, [0][0]);
+ if (ret) {
rtc_err(rtc, "Failed to read RTC time : %d\n", ret);
return ret;
}
- rtc_tm->tm_year = (v[5] & DA9052_RTC_YEAR) + 100;
- rtc_tm->tm_mon = (v[4] & DA9052_RTC_MONTH) - 1;
- rtc_tm->tm_mday = v[3] & DA9052_RTC_DAY;
- rtc_tm->tm_hour = v[2] & DA9052_RTC_HOUR;
- rtc_tm->tm_min = v[1] & DA9052_RTC_MIN;
- rtc_tm->tm_sec = v[0] & DA9052_RTC_SEC;
+ do {
+ ret = da9052_group_read(rtc->da9052,
+ DA9052_COUNT_S_REG, 6, [idx][0]);
+ if (ret) {
+ rtc_err(rtc, "Failed to read RTC time : %d\n", ret);
+ return ret;
+ }
- ret = rtc_valid_tm(rtc_tm);
- return ret;
+ if (memcmp([0][0], [1][0], 6) == 0) {
+ rtc_tm->tm_year = (v[0][5] & DA9052_RTC_YEAR) + 100;
+ rtc_tm->tm_mon = (v[0][4] & DA9052_RTC_MONTH) - 1;
+ rtc_tm->tm_mday = v[0][3] & DA9052_RTC_DAY;
+ rtc_tm->tm_hour = v[0][2] & DA9052_RTC_HOUR;
+ rtc_tm->tm_min = v[0][1] & DA9052_RTC_MIN;
+ rtc_tm->tm_sec = v[0][0] & DA9052_RTC_SEC;
+
+ ret = rtc_valid_tm(rtc_tm);
+ return ret;
+ }
+
+ idx = (1-idx);
+ msleep(20
[PATCH v1 0/2] mfd: da9052: Fix SPI access and IRQ config
Hi, This patch set is based on mainline v4.0-rc2. It corrects the SPI configuration to support both the basic hardware requirements and the defined OTP settings the device will be delivered with, to customers using an SPI configuration. It also configures the IRQ so the RTC component can perform wake-from-suspend, which is established in a separate patch set for that subsystem, to follow. Best regards, Adam Adam Ward (2): mfd: da9052: Fix register access via SPI mfd: da9052: Register ability of device to cause a wake-up interrupt drivers/mfd/da9052-irq.c | 2 ++ drivers/mfd/da9052-spi.c | 6 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- end-of-patch for mfd: da9052: Fix SPI access and IRQ config -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 2/2] mfd: da9052: Register ability of device to cause a wake-up interrupt
Signed-off-by: Adam Ward adam.ward.opensou...@diasemi.com Tested-by: Adam Ward adam.ward.opensou...@diasemi.com --- drivers/mfd/da9052-irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mfd/da9052-irq.c b/drivers/mfd/da9052-irq.c index 57ae784..e65ca19 100644 --- a/drivers/mfd/da9052-irq.c +++ b/drivers/mfd/da9052-irq.c @@ -262,6 +262,8 @@ int da9052_irq_init(struct da9052 *da9052) goto regmap_err; } + enable_irq_wake(da9052-chip_irq); + ret = da9052_request_irq(da9052, DA9052_IRQ_ADC_EOM, adc-irq, da9052_auxadc_irq, da9052); -- end-of-patch for mfd: da9052: Fix SPI access and IRQ config -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 2/3] rtc: da9052: Add constraints to set valid year
Signed-off-by: Adam Ward adam.ward.opensou...@diasemi.com Tested-by: Adam Ward adam.ward.opensou...@diasemi.com --- drivers/rtc/rtc-da9052.c | 8 1 file changed, 8 insertions(+) diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index ead02fa..acc3e5a 100644 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c @@ -206,6 +206,10 @@ static int da9052_rtc_set_time(struct device *dev, struct rtc_time *tm) uint8_t v[6]; int ret; + /* DA9052 only has 6 bits for year - to represent 2000-2063 */ + if ((tm-tm_year 100) || (tm-tm_year 163)) + return -EINVAL; + rtc = dev_get_drvdata(dev); v[0] = tm-tm_sec; @@ -243,6 +247,10 @@ static int da9052_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) struct rtc_time *tm = alrm-time; struct da9052_rtc *rtc = dev_get_drvdata(dev); + /* DA9052 only has 6 bits for year - to represent 2000-2063 */ + if ((tm-tm_year 100) || (tm-tm_year 163)) + return -EINVAL; + ret = da9052_rtc_enable_alarm(rtc, 0); if (ret 0) return ret; -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 1/2] mfd: da9052: Fix register access via SPI
The range of registers used by this driver exceeds that available
via SPI with no paging (127), so we have to override the values
from the default config which is set-up for I2C access.
Also change SPI settings to match device's recommended OTP values.
Signed-off-by: Adam Ward adam.ward.opensou...@diasemi.com
Tested-by: Adam Ward adam.ward.opensou...@diasemi.com
---
drivers/mfd/da9052-spi.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c
index 45ae0b7..b5de8a6 100644
--- a/drivers/mfd/da9052-spi.c
+++ b/drivers/mfd/da9052-spi.c
@@ -32,7 +32,7 @@ static int da9052_spi_probe(struct spi_device *spi)
if (!da9052)
return -ENOMEM;
- spi-mode = SPI_MODE_0 | SPI_CPOL;
+ spi-mode = SPI_MODE_0;
spi-bits_per_word = 8;
spi_setup(spi);
@@ -43,6 +43,10 @@ static int da9052_spi_probe(struct spi_device *spi)
config = da9052_regmap_config;
config.read_flag_mask = 1;
+ config.reg_bits = 7;
+ config.pad_bits = 1;
+ config.val_bits = 8;
+ config.use_single_rw = 1;
da9052-regmap = devm_regmap_init_spi(spi, config);
if (IS_ERR(da9052-regmap)) {
--
end-of-patch for mfd: da9052: Fix SPI access and IRQ config
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 1/3] rtc: da9052: Add extra reads with timeouts to avoid returning partially updated values
The RTC is in a different clock domain so a quick read after write
can retrieve a mangled value of the old/new values
Signed-off-by: Adam Ward adam.ward.opensou...@diasemi.com
Tested-by: Adam Ward adam.ward.opensou...@diasemi.com
---
drivers/rtc/rtc-da9052.c | 87
1 file changed, 66 insertions(+), 21 deletions(-)
diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index 613c43b..ead02fa 100644
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -16,6 +16,7 @@
#include linux/platform_device.h
#include linux/rtc.h
#include linux/err.h
+#include linux/delay.h
#include linux/mfd/da9052/da9052.h
#include linux/mfd/da9052/reg.h
@@ -23,6 +24,8 @@
#define rtc_err(rtc, fmt, ...) \
dev_err(rtc-da9052-dev, %s: fmt, __func__, ##__VA_ARGS__)
+#define DA9052_GET_TIME_RETRIES 5
+
struct da9052_rtc {
struct rtc_device *rtc;
struct da9052 *da9052;
@@ -58,22 +61,43 @@ static irqreturn_t da9052_rtc_irq(int irq, void *data)
static int da9052_read_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
{
int ret;
- uint8_t v[5];
+ uint8_t v[2][5];
+ int idx = 1;
+ int timeout = DA9052_GET_TIME_RETRIES;
- ret = da9052_group_read(rtc-da9052, DA9052_ALARM_MI_REG, 5, v);
- if (ret != 0) {
+ ret = da9052_group_read(rtc-da9052, DA9052_ALARM_MI_REG, 5, v[0][0]);
+ if (ret) {
rtc_err(rtc, Failed to group read ALM: %d\n, ret);
return ret;
}
- rtc_tm-tm_year = (v[4] DA9052_RTC_YEAR) + 100;
- rtc_tm-tm_mon = (v[3] DA9052_RTC_MONTH) - 1;
- rtc_tm-tm_mday = v[2] DA9052_RTC_DAY;
- rtc_tm-tm_hour = v[1] DA9052_RTC_HOUR;
- rtc_tm-tm_min = v[0] DA9052_RTC_MIN;
+ do {
+ ret = da9052_group_read(rtc-da9052,
+ DA9052_ALARM_MI_REG, 5, v[idx][0]);
+ if (ret) {
+ rtc_err(rtc, Failed to group read ALM: %d\n, ret);
+ return ret;
+ }
- ret = rtc_valid_tm(rtc_tm);
- return ret;
+ if (memcmp(v[0][0], v[1][0], 5) == 0) {
+ rtc_tm-tm_year = (v[0][4] DA9052_RTC_YEAR) + 100;
+ rtc_tm-tm_mon = (v[0][3] DA9052_RTC_MONTH) - 1;
+ rtc_tm-tm_mday = v[0][2] DA9052_RTC_DAY;
+ rtc_tm-tm_hour = v[0][1] DA9052_RTC_HOUR;
+ rtc_tm-tm_min = v[0][0] DA9052_RTC_MIN;
+
+ ret = rtc_valid_tm(rtc_tm);
+ return ret;
+ }
+
+ idx = (1-idx);
+ msleep(20);
+
+ } while (timeout--);
+
+ rtc_err(rtc, Timed out reading alarm time\n);
+
+ return -EIO;
}
static int da9052_set_alarm(struct da9052_rtc *rtc, struct rtc_time *rtc_tm)
@@ -135,24 +159,45 @@ static int da9052_rtc_get_alarm_status(struct da9052_rtc
*rtc)
static int da9052_rtc_read_time(struct device *dev, struct rtc_time *rtc_tm)
{
struct da9052_rtc *rtc = dev_get_drvdata(dev);
- uint8_t v[6];
int ret;
+ uint8_t v[2][6];
+ int idx = 1;
+ int timeout = DA9052_GET_TIME_RETRIES;
- ret = da9052_group_read(rtc-da9052, DA9052_COUNT_S_REG, 6, v);
- if (ret 0) {
+ ret = da9052_group_read(rtc-da9052, DA9052_COUNT_S_REG, 6, v[0][0]);
+ if (ret) {
rtc_err(rtc, Failed to read RTC time : %d\n, ret);
return ret;
}
- rtc_tm-tm_year = (v[5] DA9052_RTC_YEAR) + 100;
- rtc_tm-tm_mon = (v[4] DA9052_RTC_MONTH) - 1;
- rtc_tm-tm_mday = v[3] DA9052_RTC_DAY;
- rtc_tm-tm_hour = v[2] DA9052_RTC_HOUR;
- rtc_tm-tm_min = v[1] DA9052_RTC_MIN;
- rtc_tm-tm_sec = v[0] DA9052_RTC_SEC;
+ do {
+ ret = da9052_group_read(rtc-da9052,
+ DA9052_COUNT_S_REG, 6, v[idx][0]);
+ if (ret) {
+ rtc_err(rtc, Failed to read RTC time : %d\n, ret);
+ return ret;
+ }
- ret = rtc_valid_tm(rtc_tm);
- return ret;
+ if (memcmp(v[0][0], v[1][0], 6) == 0) {
+ rtc_tm-tm_year = (v[0][5] DA9052_RTC_YEAR) + 100;
+ rtc_tm-tm_mon = (v[0][4] DA9052_RTC_MONTH) - 1;
+ rtc_tm-tm_mday = v[0][3] DA9052_RTC_DAY;
+ rtc_tm-tm_hour = v[0][2] DA9052_RTC_HOUR;
+ rtc_tm-tm_min = v[0][1] DA9052_RTC_MIN;
+ rtc_tm-tm_sec = v[0][0] DA9052_RTC_SEC;
+
+ ret = rtc_valid_tm(rtc_tm);
+ return ret;
+ }
+
+ idx = (1-idx);
+ msleep(20);
+
+ } while (timeout--);
+
+ rtc_err(rtc, Timed out reading time\n);
+
+ return -EIO;
}
static int
[PATCH v1 0/2] mfd: da9052: Fix SPI access and IRQ config
Hi, This patch set is based on mainline v4.0-rc2. It corrects the SPI configuration to support both the basic hardware requirements and the defined OTP settings the device will be delivered with, to customers using an SPI configuration. It also configures the IRQ so the RTC component can perform wake-from-suspend, which is established in a separate patch set for that subsystem, to follow. Best regards, Adam Adam Ward (2): mfd: da9052: Fix register access via SPI mfd: da9052: Register ability of device to cause a wake-up interrupt drivers/mfd/da9052-irq.c | 2 ++ drivers/mfd/da9052-spi.c | 6 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- end-of-patch for mfd: da9052: Fix SPI access and IRQ config -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 0/3] rtc: da9052: Corrections to access, validation and capability
Hi, This patch set is based on mainline v4.0-rc2. It makes corrections to restrict the year setting to the range defined for the device to support. It also prevents erroneous values being returned, as was discovered possible when reading a time immediately after setting it. And lastly, it enables the wake-from-suspend capability. Best regards, Adam Adam Ward (3): rtc: da9052: Add extra reads with timeouts to avoid returning partially updated values rtc: da9052: Add constraints to set valid year rtc: da9052: Register ability of alarm to wake device from suspend drivers/rtc/rtc-da9052.c | 97 +--- 1 file changed, 76 insertions(+), 21 deletions(-) -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v1 3/3] rtc: da9052: Register ability of alarm to wake device from suspend
Signed-off-by: Adam Ward adam.ward.opensou...@diasemi.com Tested-by: Adam Ward adam.ward.opensou...@diasemi.com --- drivers/rtc/rtc-da9052.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c index acc3e5a..1ba4371 100644 --- a/drivers/rtc/rtc-da9052.c +++ b/drivers/rtc/rtc-da9052.c @@ -309,6 +309,8 @@ static int da9052_rtc_probe(struct platform_device *pdev) return ret; } + device_init_wakeup(pdev-dev, true); + rtc-rtc = devm_rtc_device_register(pdev-dev, pdev-name, da9052_rtc_ops, THIS_MODULE); return PTR_ERR_OR_ZERO(rtc-rtc); -- end-of-patch for rtc: da9052: Corrections to access, validation and capability -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
