regulator: da9121: add DA914x support
Subsystems (3)
PATCH 2/2 DA9121: add DA914x support
In reply to Adam Ward--- drivers/regulator/da9121-regulator.c | 113 ++++++++++++++++++++++++++- drivers/regulator/da9121-regulator.h | 21 ++++- 2 files changed, 129 insertions(+), 5 deletions(-)
drivers/regulator/da9121-regulator.c +110 -3
@@ -86,6 +86,22 @@ static struct da9121_range da9121_3A_1phase_current = { .reg_max = 6, }; +static struct da9121_range da914x_40A_4phase_current = { + .val_min =14000000 , + .val_max =80000000 , + .val_stp =2000000 , + .reg_min =1 , + .reg_max =14 , +}; + +static struct da9121_range da914x_20A_2phase_current = { + .val_min =7000000 , + .val_max =40000000 , + .val_stp =2000000 , + .reg_min =1 , + .reg_max =14 , +}; +struct da9121_variant_info {int num_bucks;int num_phases;
@@ -97,6 +113,8 @@ static const struct da9121_variant_info variant_parameters[] = { { 2, 1, &da9121_3A_1phase_current }, //DA9121_TYPE_DA9220_DA9132 { 2, 1, &da9121_5A_1phase_current }, //DA9121_TYPE_DA9122_DA9131 { 1, 2, &da9121_6A_2phase_current }, //DA9121_TYPE_DA9217 + { 1, 4, &da914x_40A_4phase_current }, //DA9121_TYPE_DA9141 + { 1, 2, &da914x_20A_2phase_current }, //DA9121_TYPE_DA9142 }; struct da9121_field {
@@ -253,6 +271,11 @@ static int da9121_set_current_limit(struct regulator_dev *rdev, goto error; } +if (rdev->desc->ops->is_enabled (rdev)) { + ret = -EBUSY ; + goto error; + } + ret =da9121_ceiling_selector (rdev, min_ua, max_ua, &sel);if (ret <0 ) goto error;
@@ -537,11 +560,65 @@ static const struct regulator_desc da9217_reg = { .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, }; +#define DA914X_MIN_MV 500 +#define DA914X_MAX_MV 1000 +#define DA914X_STEP_MV 10 +#define DA914X_MIN_SEL (DA914X_MIN_MV / DA914X_STEP_MV) +#define DA914X_N_VOLTAGES (((DA914X_MAX_MV - DA914X_MIN_MV) / DA914X_STEP_MV) \ + + 1 + DA914X_MIN_SEL) + +static const struct regulator_desc da9141_reg = { + .id =DA9141_IDX_BUCK1 , + .name ="DA9141" , + .of_match ="buck1" , + .of_parse_cb = da9121_of_parse_cb, + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .of_map_mode = da9121_map_mode, + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA914X_N_VOLTAGES , + .min_uV =DA914X_MIN_MV *1000 , + .uV_step =DA914X_STEP_MV *1000 , + .linear_min_sel =DA914X_MIN_SEL , + .vsel_reg =DA9121_REG_BUCK_BUCK1_5 , + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, + .enable_reg =DA9121_REG_BUCK_BUCK1_0 , + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, +/* Default value of BUCK_BUCK1_0.CH1_SRC_DVC_UP */ + .ramp_delay =20000 , +/* tBUCK_EN */ + .enable_time =20 , +}; + +static const struct regulator_desc da9142_reg = { + .id =DA914X_IDX_BUCK1 , + .name ="DA9142 BUCK1" , + .of_match ="buck1" , + .of_parse_cb = da9121_of_parse_cb, + .owner =THIS_MODULE , + .regulators_node =of_match_ptr ("regulators" ), + .of_map_mode = da9121_map_mode, + .ops = &da9121_buck_ops, + .type =REGULATOR_VOLTAGE , + .n_voltages =DA914X_N_VOLTAGES , + .min_uV =DA914X_MIN_MV *1000 , + .uV_step =DA914X_STEP_MV *1000 , + .linear_min_sel =DA914X_MIN_SEL , + .enable_reg =DA9121_REG_BUCK_BUCK1_0 , + .enable_mask = DA9121_MASK_BUCK_BUCKx_0_CHx_EN, + .vsel_reg =DA9121_REG_BUCK_BUCK1_5 , + .vsel_mask = DA9121_MASK_BUCK_BUCKx_5_CHx_A_VOUT, +}; + +static const struct regulator_desc *local_da9121_regulators[][DA9121_IDX_MAX ] = { [DA9121_TYPE_DA9121_DA9130 ] = { &da9121_reg,NULL }, [DA9121_TYPE_DA9220_DA9132 ] = { &da9220_reg[0 ], &da9220_reg[1 ] }, [DA9121_TYPE_DA9122_DA9131 ] = { &da9122_reg[0 ], &da9122_reg[1 ] }, [DA9121_TYPE_DA9217 ] = { &da9217_reg,NULL }, + [DA9121_TYPE_DA9141 ] = { &da9141_reg,NULL }, + [DA9121_TYPE_DA9142 ] = { &da9142_reg,NULL }, };static void da9121_status_poll_on (struct work_struct *work)
@@ -835,7 +912,7 @@ static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip) goto error; } -if (device_id !=DA9121_DEVICE_ID ) { + if ((device_id != DA9121_DEVICE_ID) && (device_id != DA914X_DEVICE_ID) {dev_err (chip->dev,"Invalid device ID: 0x%02x\n" , device_id); ret = -ENODEV ; goto error;
@@ -877,6 +954,22 @@ static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip)break ; } +if (device_id ==DA914X_DEVICE_ID ) { +switch (chip->subvariant_id) { +case DA9121_SUBTYPE_DA9141 : + type ="DA9141" ; + config_match = (variant_vrc ==DA9141_VARIANT_VRC ); +break ; +case DA9121_SUBTYPE_DA9142 : + type ="DA9142" ; + config_match = (variant_vrc ==DA9142_VARIANT_VRC ); +break ; +default : + type ="Unknown" ; +break ; + } + } +dev_info (chip->dev,"Device detected (device-ID: 0x%02X, var-ID: 0x%02X, %s)\n" , device_id, variant_id, type);
@@ -890,8 +983,10 @@ static int da9121_check_device_type(struct i2c_client *i2c, struct da9121 *chip) variant_mrc = (variant_id &DA9121_MASK_OTP_VARIANT_ID_MRC ) >>DA9121_SHIFT_OTP_VARIANT_ID_MRC ; -if ((device_id ==DA9121_DEVICE_ID ) && - (variant_mrc <DA9121_VARIANT_MRC_BASE )) { +if (((device_id ==DA9121_DEVICE_ID ) && + (variant_mrc <DA9121_VARIANT_MRC_BASE )) || + ((device_id ==DA914X_DEVICE_ID ) && + (variant_mrc !=DA9141_VARIANT_MRC_BASE ))) {dev_err (chip->dev,"Cannot support variant MRC: 0x%02X\n" , variant_mrc); ret = -EINVAL ;
@@ -931,6 +1026,14 @@ static int da9121_assign_chip_model(struct i2c_client *i2c, chip->variant_id =DA9121_TYPE_DA9220_DA9132 ; regmap = &da9121_2ch_regmap_config;break ; +case DA9121_SUBTYPE_DA9141 : + chip->variant_id =DA9121_TYPE_DA9141 ; + regmap = &da9121_1ch_regmap_config; +break ; +case DA9121_SUBTYPE_DA9142 : + chip->variant_id =DA9121_TYPE_DA9142 ; + regmap = &da9121_2ch_regmap_config; +break ; }/* Set these up for of_regulator_match call which may want .of_map_modes */
@@ -1010,6 +1113,8 @@ static const struct of_device_id da9121_dt_ids[] = { { .compatible = "dlg,da9131", .data = (void *) DA9121_SUBTYPE_DA9131 }, { .compatible = "dlg,da9220", .data = (void *) DA9121_SUBTYPE_DA9220 }, { .compatible = "dlg,da9132", .data = (void *) DA9121_SUBTYPE_DA9132 }, + { .compatible = "dlg,da9141", .data = (void *) DA9121_SUBTYPE_DA9141 }, + { .compatible = "dlg,da9142", .data = (void *) DA9121_SUBTYPE_DA9142 }, { } };MODULE_DEVICE_TABLE (of, da9121_dt_ids);
@@ -1084,6 +1189,8 @@ static const struct i2c_device_id da9121_i2c_id[] = { {"da9131", DA9121_TYPE_DA9122_DA9131}, {"da9220", DA9121_TYPE_DA9220_DA9132}, {"da9132", DA9121_TYPE_DA9220_DA9132}, + {"da9141", DA9121_TYPE_DA9141}, + {"da9142", DA9121_TYPE_DA9142}, {}, };MODULE_DEVICE_TABLE (i2c, da9121_i2c_id);
drivers/regulator/da9121-regulator.h +19 -2
@@ -26,7 +26,9 @@ enum da9121_variant {DA9121_TYPE_DA9121_DA9130 ,DA9121_TYPE_DA9220_DA9132 ,DA9121_TYPE_DA9122_DA9131 , -DA9121_TYPE_DA9217 +DA9121_TYPE_DA9217 , +DA9121_TYPE_DA9141 , +DA9121_TYPE_DA9142 }; enum da9121_subvariant {
@@ -36,7 +38,9 @@ enum da9121_subvariant {DA9121_SUBTYPE_DA9132 ,DA9121_SUBTYPE_DA9122 ,DA9121_SUBTYPE_DA9131 , - DA9121_SUBTYPE_DA9217 +DA9121_SUBTYPE_DA9217 , +DA9121_SUBTYPE_DA9141 , + DA9121_SUBTYPE_DA9142 };/* Minimum, maximum and default polling millisecond periods are provided
@@ -70,6 +74,14 @@ enum da9121_subvariant {#define DA9121_REG_SYS_GPIO1_1 0x13#define DA9121_REG_SYS_GPIO2_0 0x14#define DA9121_REG_SYS_GPIO2_1 0x15 +#define DA914x_REG_SYS_GPIO3_0 0x16 +#define DA914x_REG_SYS_GPIO3_1 0x17 +#define DA914x_REG_SYS_GPIO4_0 0x18 +#define DA914x_REG_SYS_GPIO4_1 0x19 +#define DA914x_REG_SYS_ADMUX1_0 0x1A +#define DA914x_REG_SYS_ADMUX1_1 0x1B +#define DA914x_REG_SYS_ADMUX2_0 0x1C +#define DA914x_REG_SYS_ADMUX2_1 0x1D#define DA9121_REG_BUCK_BUCK1_0 0x20#define DA9121_REG_BUCK_BUCK1_1 0x21#define DA9121_REG_BUCK_BUCK1_2 0x22
@@ -276,6 +288,7 @@ enum da9121_subvariant {#define DA9121_MASK_OTP_DEVICE_ID_DEV_ID 0xFF#define DA9121_DEVICE_ID 0x05 +#define DA914x_DEVICE_ID 0x26/* DA9121_REG_OTP_VARIANT_ID */
@@ -293,6 +306,10 @@ enum da9121_subvariant {#define DA9131_VARIANT_VRC 0x1#define DA9132_VARIANT_VRC 0x2 +#define DA914x_VARIANT_MRC_BASE 0x0 +#define DA9141_VARIANT_VRC 0x1 +#define DA9142_VARIANT_VRC 0x2 +/* DA9121_REG_OTP_CUSTOMER_ID */ #define DA9121_MASK_OTP_CUSTOMER_ID_CUST_ID 0xFF
Signature · 1 line
2.25.1
PATCH 1/2 DA9121: add DA914x binding info
In reply to Adam Ward--- .../bindings/regulator/dlg,da9121.yaml | 85 ++++++++++++------- 1 file changed, 53 insertions(+), 32 deletions(-)
Documentation/devicetree/bindings/regulator/dlg,da9121.yaml +53 -32
@@ -17,27 +17,39 @@ description: | 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... - - | DA9121 DA9122 DA9220 DA9217 DA9140 - | /DA9130 /DA9131 /DA9132 - ----------------------------------------------------------------------------- - Output current / channel | 10000000 5000000 3000000 6000000 40000000 - Output current / phase | 5000000 5000000 3000000 3000000 9500000 - ----------------------------------------------------------------------------- - Min regulator-min-microvolt| 300000 300000 300000 300000 500000 - Max regulator-max-microvolt| 1900000 1900000 1900000 1900000 1000000 - Device hardware default | 1000000 1000000 1000000 1000000 1000000 - ----------------------------------------------------------------------------- - Min regulator-min-microamp | 7000000 3500000 3500000 7000000 26000000 - Max regulator-max-microamp | 20000000 10000000 6000000 12000000 78000000 - Device hardware default | 15000000 7500000 5500000 11000000 58000000 + Dialog Semiconductor DA9141 Single-channel 40A quad-phase buck converter + Dialog Semiconductor DA9142 Single-channel 20A double-phase buck converter + + Device parameter ranges + + The current limits can be set to at/near double the rated current per channel + to allow for transient peaks. + Current limit changes when the output is enabled are not supported, as a + precaution against undefined behaviour. + + |----------------------------------------------| + | | range & reset default value | + | Device |------------------------------| + | | microvolt | microamp | + |----------------------------------------------| + | DA9121/DA9130 | Min: 300000 | Min: 7000000 | + | | Max: 1900000 | Max: 20000000 | + |----------------------------------------------| + | DA9121/DA9131 | Min: 300000 | Min: 3500000 | + | | Max: 1900000 | Max: 10000000 | + |----------------------------------------------| + | DA9121/DA9131 | Min: 300000 | Min: 3500000 | + | | Max: 1900000 | Max: 6000000 | + |----------------------------------------------| + | DA9217 | Min: 300000 | Min: 7000000 | + | | Max: 1900000 | Max: 12000000 | + |----------------------------------------------| + | DA9141 | Min: 300000 | Min: 26000000 | + | | Max: 1300000 | Max: 78000000 | + |----------------------------------------------| + | DA9142 | Min: 300000 | Min: 13000000 | + | | Max: 1300000 | Max: 39000000 | + |----------------------------------------------| properties: $nodename:
@@ -51,7 +63,8 @@ properties: - dlg,da9130 - dlg,da9131 - dlg,da9132 - - dlg,da9140 + - dlg,da9141 + - dlg,da9142 reg: maxItems: 1
@@ -70,26 +83,33 @@ properties: regulators: type: object - $ref: regulator.yaml# + maxItems: 2 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 + List of regulators provided by the device patternProperties: "^buck([1-2])$": type: object $ref: regulator.yaml# + description: | + List of regulators provided by the device + 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 properties: - regulator-mode: - maxItems: 1 - description: Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h + 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: - maxItems: 1 + enum: [ 0, 1, 2, 3 ] description: Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h enable-gpios:
@@ -98,6 +118,7 @@ properties: dlg,ripple-cancel: $ref: "/schemas/types.yaml#/definitions/uint32" + enum: [ 0, 1, 2, 3 ] description: | Defined in include/dt-bindings/regulator/dlg,da9121-regulator.h Only present on multi-channel devices (DA9122, DA9220, DA9131, DA9132)
Signature · 1 line
2.25.1
cover regulator: da9121: add DA914x support
This series extends the DA9121 driver to add support for related products:
DA9141, 40A, Quad-Phase
DA9142, 20A, Dual-Phase
The changing of current limit when active is now prohibited, for the range, due to possibility of undefined behaviour during transition
Adam Ward (2):
DA9121: add DA914x binding info
DA9121: add DA914x support
.../bindings/regulator/dlg,da9121.yaml | 85 ++++++++----- drivers/regulator/da9121-regulator.c | 113 +++++++++++++++++- drivers/regulator/da9121-regulator.h | 21 +++- 3 files changed, 182 insertions(+), 37 deletions(-)
Signature · 1 line
2.25.1
Mark Brown
maintainerRe: [PATCH 1/2] DA9121: add DA914x binding info
In reply to Adam WardDocumentation/devicetree/bindings/regulator/dlg,da9121.yaml properties: · line 67
Quoted 4 lines · Adam Ward
- dlg,da9132
Documentation/devicetree/bindings/regulator/dlg,da9121.yaml +2
-1- - dlg,da9140 + - dlg,da9141 + - dlg,da9142
This is removing the existing DA9140 compatible?
RE: [PATCH 1/2] DA9121: add DA914x binding info
Quoted 3 lines · Mark Brown
This is removing the existing DA9140 compatible?
No. It's never been recognised in the driver itself and shouldn't have been there. Detritus from an obsolete test.
Mark Brown
maintainerRe: [PATCH 1/2] DA9121: add DA914x binding info
Quoted 6 lines · Adam Ward
Quoted 3 lines · Mark Brown
This is removing the existing DA9140 compatible?
No. It's never been recognised in the driver itself and shouldn't have been there. Detritus from an obsolete test.
So by "no" you mean "yes" then? In any case you shouldn't be putting a change like this in the middle of an unrelated commit without mentioning it in the commit log, if you feel the need to remove this compatible you should make a commit doing so. Please see submitting-patches.rst for details on splitting changes up.
Rob Herring
maintainerRe: [PATCH 1/2] DA9121: add DA914x binding info
In reply to Adam WardQuoted 5 lines · Adam Ward
Signed-off-by Adam Ward <[email protected]>--- .../bindings/regulator/dlg,da9121.yaml | 85 ++++++++++++------- 1 file changed, 53 insertions(+), 32 deletions(-)
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:./Documentation/devicetree/bindings/regulator/dlg,da9121.yaml:103:46: [error] empty value in block mapping (empty-values) ./Documentation/devicetree/bindings/regulator/dlg,da9121.yaml:106:23: [error] syntax error: mapping values are not allowed here (syntax)
dtschema/dtc warnings/errors:./Documentation/devicetree/bindings/regulator/dlg,da9121.yaml: mapping values are not allowed in this context
in "<unicode string>", line 106, column 23
make[1]: *** Deleting file 'Documentation/devicetree/bindings/regulator/dlg,da9121.example.dts'
Traceback (most recent call last):
File "/usr/local/bin/dt-extract-example", line 45, in <module>
binding = yaml.load(open(args.yamlfile, encoding='utf-8').read())
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/main.py", line 434, in load
return constructor.get_single_data()
File "/usr/local/lib/python3.8/dist-packages/ruamel/yaml/constructor.py", line 119, in get_single_data
node = self.composer.get_single_node()
File "_ruamel_yaml.pyx", line 706, in _ruamel_yaml.CParser.get_single_node
File "_ruamel_yaml.pyx", line 724, in _ruamel_yaml.CParser._compose_document
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 889, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 775, in _ruamel_yaml.CParser._compose_node
File "_ruamel_yaml.pyx", line 891, in _ruamel_yaml.CParser._compose_mapping_node
File "_ruamel_yaml.pyx", line 904, in _ruamel_yaml.CParser._parse_next_event
ruamel.yaml.scanner.ScannerError: mapping values are not allowed in this context
in "<unicode string>", line 106, column 23
make[1]: *** [Documentation/devicetree/bindings/Makefile:25: Documentation/devicetree/bindings/regulator/dlg,da9121.example.dts] Error 1 make[1]: *** Waiting for unfinished jobs.... /builds/robherring/linux-dt-review/Documentation/devicetree/bindings/regulator/dlg,da9121.yaml: ignoring, error parsing file
warning: no schema found in file: ./Documentation/devicetree/bindings/regulator/dlg,da9121.yaml
make: *** [Makefile:1413: dt_binding_check] Error 2
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1558524
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.