Support ROHM Scalable PMIC family
Subsystems (4)
Matti Vaittinen
maintainercover Support ROHM Scalable PMIC family
Support ROHM BD96802, BD96805 and BD96806 PMICs
The ROHM BD96801 [1] and BD96805 [2] are almost identical PMICs what comes to the digital interface. Main difference is voltage tuning range. Supporting BD96805 with BD96801 drivers is mostly just a matter of being able to differentiate the PMICs (done based on the devicetree compatible) and then providing separate voltage tables.
The ROHM BD96802 [3] is a companion PMIC which is intended to be used to provide more capacity on systems where the BD96801 alone is not sufficient. Startup sequence of these PMICs can be synchronized in hardware level, and there seems to be some mechanisms which allow delivering the companion PMIC (BD96802) status to the main PMIC (BD96801/BD96805). This patch series does treat the companion PMIC(s) as individual PMICs and allows using them from software point of view as a stand alone ICs. From the digital point of view, the BD96802 is a subset of BD96801, providing only buck1 and buck2 regulators. Please see the data sheet
The ROHM BD96806 [4] is similar to the BD96802, except that it does also provide different voltage tuning ranges.
This series adds basic voltage monitoring and control as well as a watchdog support for these PMICs using the BD96801 drivers.
Similarly to the BD96801, these PMICs too have a few configurations which can only be done when the PMIC is in STBY state. Similarly to the BD96801, doing these configurations isn't supported by the driver. The original BD96801 RFC [5] driver should be able to cover those configurations, if modified to support these models.
[1]: ROHM BD96801 data sheet:
https://fscdn.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator_system/product_brief_bd96801qxx-c-e.pdf
[2]: ROHM BD96805 data sheet:
https://fscdn.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator_system/product_brief_bd96805qxx-c-e.pdf
[3]: ROHM BD96802 data sheet:
https://fscdn.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator_system/product_brief_bd96802qxx-c-e.pdf
[4]: ROHM BD96806 data sheet:
https://fscdn.rohm.com/en/products/databook/datasheet/ic/power/switching_regulator_system/product_brief_bd96806qxx-c-e.pdf
[5]: Original BD96801 RFC:
https://lore.kernel.org/all/[email protected]/
---
Matti Vaittinen (14):
dt-bindings: regulator: Add ROHM BD96802 PMIC
dt-bindings: mfd: Add ROHM BD96802 PMIC
dt-bindings: mfd: bd96801: Add ROHM BD96805
dt-bindings: mfd: bd96802: Add ROHM BD96806
mfd: rohm-bd96801: Add chip info
mfd: bd96801: Drop IC name from the regulator IRQ resources
regulator: bd96801: Drop IC name from the IRQ resources
mfd: rohm-bd96801: Support ROHM BD96802
regulator: bd96801: Support ROHM BD96802
mfd: bd96801: Support ROHM BD96805
regulator: bd96801: Support ROHM BD96805 PMIC
mfd: bd96801: Support ROHM BD96806
regulator: bd96801: Support ROHM BD96806 PMIC
MAINTAINERS: Add BD96802 specific header
.../bindings/mfd/rohm,bd96801-pmic.yaml | 10 +- .../bindings/mfd/rohm,bd96802-pmic.yaml | 101 ++++ .../regulator/rohm,bd96802-regulator.yaml | 44 ++ MAINTAINERS | 1 + drivers/mfd/rohm-bd96801.c | 549 ++++++++++++++---- drivers/regulator/bd96801-regulator.c | 447 ++++++++++++-- include/linux/mfd/rohm-bd96801.h | 2 + include/linux/mfd/rohm-bd96802.h | 74 +++ 8 files changed, 1047 insertions(+), 181 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd96802-regulator.yaml create mode 100644 include/linux/mfd/rohm-bd96802.h
base-commit: 7eb172143d5508b4da468ed59ee857c6e5e01da6
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 1/14 dt-bindings: regulator: Add ROHM BD96802 PMIC
BD96802Qxx-C is an automotive grade configurable Power Management Integrated Circuit supporting Functional Safety features for application processors, SoCs and FPGAs. BD96802 is controlled via I2C, provides two interrupt lines and has two controllable buck regulators.
The BD96802 belongs to the family of ROHM Scalable PMICs and is intended to be used as a companion PMIC for the BD96801.
Signed-off-by Matti Vaittinen <[email protected]>
--- .../regulator/rohm,bd96802-regulator.yaml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd96802-regulator.yaml
Documentation/devicetree/bindings/regulator/rohm,bd96802-regulator.yaml new file +44 -0
@@ -0,0 +1,44 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/rohm,bd96802-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD96802 Power Management Integrated Circuit regulators + +maintainers: + - Matti Vaittinen <[email protected]> + +description: + This module is part of the ROHM BD96802 MFD device. For more details + see Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml. + + The regulator controller is represented as a sub-node of the PMIC node + on the device tree. + + Regulator nodes should be named to buck1 and buck2. + +patternProperties: + "^buck[1-2]$": + type: object + description: + Properties for single BUCK regulator. + $ref: regulator.yaml# + + properties: + rohm,initial-voltage-microvolt: + description: + Initial voltage for regulator. Voltage can be tuned +/-150 mV from + this value. NOTE, This can be modified via I2C only when PMIC is in + STBY state. + minimum: 500000 + maximum: 3300000 + + rohm,keep-on-stby: + description: + Keep the regulator powered when PMIC transitions to STBY state. + type: boolean + + unevaluatedProperties: false + +additionalProperties: false
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 2/14 dt-bindings: mfd: Add ROHM BD96802 PMIC
In reply to Matti VaittinenBD96802Qxx-C is an automotive grade configurable Power Management Integrated Circuit supporting Functional Safety features for application processors, SoCs and FPGAs. BD96802 is controlled via I2C, provides two interrupt lines and has two controllable buck regulators.
Signed-off-by Matti Vaittinen <[email protected]>
--- .../bindings/mfd/rohm,bd96802-pmic.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml
Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml new file +100 -0
@@ -0,0 +1,100 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/rohm,bd96802-pmic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD96802 Scalable Power Management Integrated Circuit + +maintainers: + - Matti Vaittinen <[email protected]> + +description: | + BD96802Qxx-C is an automotive grade configurable Power Management + Integrated Circuit supporting Functional Safety features for application + processors, SoCs and FPGAs + +properties: + compatible: + const: rohm,bd96802 + + reg: + description: + I2C slave address. + maxItems: 1 + + interrupts: + description: + The PMIC provides intb and errb IRQ lines. The errb IRQ line is used + for fatal IRQs which will cause the PMIC to shut down power outputs. + In many systems this will shut down the SoC contolling the PMIC and + connecting/handling the errb can be omitted. However, there are cases + where the SoC is not powered by the PMIC. In that case it may be + useful to connect the errb and handle errb events. + minItems: 1 + maxItems: 2 + + interrupt-names: + minItems: 1 + items: + - enum: [intb, errb] + - const: errb + + regulators: + $ref: ../regulator/rohm,bd96802-regulator.yaml + description: + List of child nodes that specify the regulators. + +required: + - compatible + - reg + - interrupts + - interrupt-names + - regulators + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/leds/common.h> + i2c { + #address-cells = <1>; + #size-cells = <0>; + pmic: pmic@62 { + reg = <0x62>; + compatible = "rohm,bd96802"; + interrupt-parent = <&gpio1>; + interrupts = <29 IRQ_TYPE_LEVEL_LOW>, <6 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "intb", "errb"; + + regulators { + buck1: BUCK1 { + regulator-name = "buck1"; + regulator-ramp-delay = <1250>; + /* 0.5V min INITIAL - 150 mV tune */ + regulator-min-microvolt = <350000>; + /* 3.3V + 150mV tune */ + regulator-max-microvolt = <3450000>; + + /* These can be set only when PMIC is in STBY */ + rohm,initial-voltage-microvolt = <500000>; + regulator-ov-error-microvolt = <230000>; + regulator-uv-error-microvolt = <230000>; + regulator-temp-protection-kelvin = <1>; + regulator-temp-warn-kelvin = <0>; + }; + buck2: BUCK2 { + regulator-name = "buck2"; + regulator-min-microvolt = <350000>; + regulator-max-microvolt = <3450000>; + + rohm,initial-voltage-microvolt = <3000000>; + regulator-ov-error-microvolt = <18000>; + regulator-uv-error-microvolt = <18000>; + regulator-temp-protection-kelvin = <1>; + regulator-temp-warn-kelvin = <1>; + }; + }; + }; + };
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 3/14 dt-bindings: mfd: bd96801: Add ROHM BD96805
In reply to Matti VaittinenThe ROHM BD96805 is very similar to the BD96801. The differences visible to the drivers is different tune voltage ranges.
Add compatible for the ROHM BD96805 PMIC.
Signed-off-by Matti Vaittinen <[email protected]>
--- .../devicetree/bindings/mfd/rohm,bd96801-pmic.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mfd/rohm,bd96801-pmic.yaml +6 -4
@@ -4,19 +4,21 @@ $id: http://devicetree.org/schemas/mfd/rohm,bd96801-pmic.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: ROHM BD96801 Scalable Power Management Integrated Circuit +title: ROHM BD96801/BD96805 Scalable Power Management Integrated Circuit maintainers: - Matti Vaittinen <[email protected]> description: - BD96801 is an automotive grade single-chip power management IC. - It integrates 4 buck converters and 3 LDOs with safety features like + BD96801 and BD96805 are automotive grade, single-chip power management ICs. + They both integrate 4 buck converters and 3 LDOs with safety features like over-/under voltage and over current detection and a watchdog. properties: compatible: - const: rohm,bd96801 + enum: + - rohm,bd96801 + - rohm,bd96805 reg: maxItems: 1
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 4/14 dt-bindings: mfd: bd96802: Add ROHM BD96806
In reply to Matti VaittinenThe ROHM BD96806 is very similar to the BD96802. The differences visible to the drivers is different tune voltage ranges.
Add compatible for the ROHM BD96805 PMIC.
Signed-off-by Matti Vaittinen <[email protected]>
--- .../bindings/mfd/rohm,bd96802-pmic.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/mfd/rohm,bd96802-pmic.yaml +10 -9
@@ -4,23 +4,23 @@ $id: http://devicetree.org/schemas/mfd/rohm,bd96802-pmic.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: ROHM BD96802 Scalable Power Management Integrated Circuit +title: ROHM BD96802 / BD96806Scalable Power Management Integrated Circuit maintainers: - Matti Vaittinen <[email protected]> description: | - BD96802Qxx-C is an automotive grade configurable Power Management - Integrated Circuit supporting Functional Safety features for application + BD96802Qxx-C and BD96806 are automotive grade configurable Power Management + Integrated Circuits supporting Functional Safety features for application processors, SoCs and FPGAs properties: compatible: - const: rohm,bd96802 + enum: + - rohm,bd96802 + - rohm,bd96806 reg: - description: - I2C slave address. maxItems: 1 interrupts:
@@ -29,7 +29,8 @@ properties: for fatal IRQs which will cause the PMIC to shut down power outputs. In many systems this will shut down the SoC contolling the PMIC and connecting/handling the errb can be omitted. However, there are cases - where the SoC is not powered by the PMIC. In that case it may be + where the SoC is not powered by the PMIC or has a short time backup + energy to handle shutdown of critical hardware. In that case it may be useful to connect the errb and handle errb events. minItems: 1 maxItems: 2
@@ -69,7 +70,7 @@ examples: interrupt-names = "intb", "errb"; regulators { - buck1: BUCK1 { + buck1 { regulator-name = "buck1"; regulator-ramp-delay = <1250>; /* 0.5V min INITIAL - 150 mV tune */
@@ -84,7 +85,7 @@ examples: regulator-temp-protection-kelvin = <1>; regulator-temp-warn-kelvin = <0>; }; - buck2: BUCK2 { + buck2 { regulator-name = "buck2"; regulator-min-microvolt = <350000>; regulator-max-microvolt = <3450000>;
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 5/14 mfd: rohm-bd96801: Add chip info
In reply to Matti VaittinenPrepare for adding support for BD96802 which is very similar to BD96801. Separate chip specific data into own structure which can be picked to be used by the device-tree.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/mfd/rohm-bd96801.c | 83 ++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 26 deletions(-)
drivers/mfd/rohm-bd96801.c +57 -26
@@ -40,7 +40,21 @@#include <linux/mfd/rohm-bd96801.h> #include <linux/mfd/rohm-generic.h> -static const struct resource regulator_errb_irqs[] = { +struct bd968xx_chip_data { +const struct resource *errb_irqs; +const struct resource *intb_irqs; +int num_errb_irqs; +int num_intb_irqs; +const struct regmap_irq_chip *errb_irq_chip; +const struct regmap_irq_chip *intb_irq_chip; +const struct regmap_config *regmap_config; +struct mfd_cell *cells; +int num_cells; +int unlock_reg; +int unlock_val; +}; + +static const struct resource bd96801_reg_errb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"bd96801-otp-err" ),DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"bd96801-dbist-err" ),DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"bd96801-eep-err" ),
@@ -98,7 +112,7 @@ static const struct resource regulator_errb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_SHDN_ERR_STAT, "bd96801-ldo7-shdn-err"), }; -static const struct resource regulator_intb_irqs[] = { +static const struct resource bd96801_reg_intb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"bd96801-core-thermal" ),DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"bd96801-buck1-overcurr-h" ),
@@ -345,18 +359,37 @@ static const struct regmap_config bd96801_regmap_config = { .cache_type = REGCACHE_MAPLE, }; +static const struct bd968xx_chip_data bd96801_chip_data = { + .errb_irqs = bd96801_reg_errb_irqs, + .intb_irqs = bd96801_reg_intb_irqs, + .num_errb_irqs =ARRAY_SIZE (bd96801_reg_errb_irqs), + .num_intb_irqs =ARRAY_SIZE (bd96801_reg_intb_irqs), + .errb_irq_chip = &bd96801_irq_chip_errb, + .intb_irq_chip = &bd96801_irq_chip_intb, + .regmap_config = &bd96801_regmap_config, + .cells = bd96801_cells, + .num_cells =ARRAY_SIZE (bd96801_cells), + .unlock_reg =BD96801_LOCK_REG , + .unlock_val =BD96801_UNLOCK , +}; +static int bd96801_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *intb_irq_data, *errb_irq_data;struct irq_domain *intb_domain, *errb_domain; +static const struct bd968xx_chip_data *cd;const struct fwnode_handle *fwnode;struct resource *regulator_res;struct resource wdg_irq;struct regmap *regmap; -int intb_irq, errb_irq, num_intb, num_errb =0 ; +int intb_irq, errb_irq, num_errb =0 ;int num_regu_irqs, wdg_irq_no;int i, ret; + cd =device_get_match_data (&i2c->dev); +if (!cd) +return -ENODEV ; + fwnode =dev_fwnode (&i2c->dev);if (!fwnode)return dev_err_probe (&i2c->dev, -EINVAL ,"Failed to find fwnode\n" );
@@ -365,34 +398,32 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)if (intb_irq <0 )return dev_err_probe (&i2c->dev, intb_irq,"INTB IRQ not configured\n" ); - num_intb =ARRAY_SIZE (regulator_intb_irqs); -/* ERRB may be omitted if processor is powered by the PMIC */ errb_irq =fwnode_irq_get_byname (fwnode,"errb" ); -if (errb_irq <0 ) - errb_irq =0 ; +if (errb_irq == -EPROBE_DEFER ) +return errb_irq; -if (errb_irq) - num_errb =ARRAY_SIZE (regulator_errb_irqs); +if (errb_irq >0 ) + num_errb = cd->num_errb_irqs; - num_regu_irqs = num_intb + num_errb; + num_regu_irqs = cd->num_intb_irqs + num_errb; regulator_res =devm_kcalloc (&i2c->dev, num_regu_irqs,sizeof (*regulator_res),GFP_KERNEL );if (!regulator_res)return -ENOMEM ; - regmap =devm_regmap_init_i2c (i2c, &bd96801_regmap_config); + regmap =devm_regmap_init_i2c (i2c, cd->regmap_config);if (IS_ERR (regmap))return dev_err_probe (&i2c->dev,PTR_ERR (regmap),"Regmap initialization failed\n" ); - ret =regmap_write (regmap,BD96801_LOCK_REG ,BD96801_UNLOCK ); + ret =regmap_write (regmap, cd->unlock_reg, cd->unlock_val);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to unlock PMIC\n" ); ret =devm_regmap_add_irq_chip (&i2c->dev, regmap, intb_irq, -IRQF_ONESHOT ,0 , &bd96801_irq_chip_intb, +IRQF_ONESHOT ,0 , cd->intb_irq_chip, &intb_irq_data);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to add INTB IRQ chip\n" );
@@ -404,24 +435,25 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)* has two domains so we do IRQ mapping here and provide the * already mapped IRQ numbers to sub-devices. */ -for (i =0 ; i < num_intb; i++) { +for (i =0 ; i < cd->num_intb_irqs; i++) {struct resource *res = ®ulator_res[i]; - *res = regulator_intb_irqs[i]; + *res = cd->intb_irqs[i]; res->start = res->end =irq_create_mapping (intb_domain, res->start); } wdg_irq_no =irq_create_mapping (intb_domain,BD96801_WDT_ERR_STAT ); wdg_irq =DEFINE_RES_IRQ_NAMED (wdg_irq_no,"bd96801-wdg" ); - bd96801_cells[WDG_CELL ].resources = &wdg_irq; - bd96801_cells[WDG_CELL ].num_resources =1 ; + + cd->cells[WDG_CELL ].resources = &wdg_irq; + cd->cells[WDG_CELL ].num_resources =1 ;if (!num_errb) goto skip_errb; ret =devm_regmap_add_irq_chip (&i2c->dev, regmap, errb_irq,IRQF_ONESHOT , -0 , &bd96801_irq_chip_errb, &errb_irq_data); +0 , cd->errb_irq_chip, &errb_irq_data);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to add ERRB IRQ chip\n" );
@@ -429,18 +461,17 @@ static int bd96801_i2c_probe(struct i2c_client *i2c) errb_domain =regmap_irq_get_domain (errb_irq_data);for (i =0 ; i < num_errb; i++) { -struct resource *res = ®ulator_res[num_intb + i]; +struct resource *res = ®ulator_res[cd->num_intb_irqs + i]; - *res = regulator_errb_irqs[i]; + *res = cd->errb_irqs[i]; res->start = res->end =irq_create_mapping (errb_domain, res->start); } skip_errb: - bd96801_cells[REGULATOR_CELL ].resources = regulator_res; - bd96801_cells[REGULATOR_CELL ].num_resources = num_regu_irqs; - - ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , bd96801_cells, -ARRAY_SIZE (bd96801_cells),NULL ,0 ,NULL ); + cd->cells[REGULATOR_CELL ].resources = regulator_res; + cd->cells[REGULATOR_CELL ].num_resources = num_regu_irqs; + ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , + cd->cells, cd->num_cells,NULL ,0 ,NULL );if (ret)dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" );
@@ -448,7 +479,7 @@ static int bd96801_i2c_probe(struct i2c_client *i2c) }static const struct of_device_id bd96801_of_match[] = { - { .compatible ="rohm,bd96801" , }, + { .compatible ="rohm,bd96801" , .data = &bd96801_chip_data, }, { } };MODULE_DEVICE_TABLE (of, bd96801_of_match);
Signature · 1 line
2.48.1
Lee Jones
maintainerRe: [PATCH 05/14] mfd: rohm-bd96801: Add chip info
Quoted 17 lines · Matti Vaittinen
Prepare for adding support for BD96802 which is very similar to BD96801. Separate chip specific data into own structure which can be picked to be used by the device-tree.
Signed-off-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd96801.c | 83 ++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 26 deletions(-)drivers/mfd/rohm-bd96801.c +0
-0@@ -40,7 +40,21 @@#include <linux/mfd/rohm-bd96801.h> #include <linux/mfd/rohm-generic.h>
drivers/mfd/rohm-bd96801.c line 51
Quoted 10 lines
drivers/mfd/rohm-bd96801.c +9
-1-static const struct resource regulator_errb_irqs[] = { +struct bd968xx_chip_data { +const struct resource *errb_irqs; +const struct resource *intb_irqs; +int num_errb_irqs; +int num_intb_irqs; +const struct regmap_irq_chip *errb_irq_chip; +const struct regmap_irq_chip *intb_irq_chip; +const struct regmap_config *regmap_config; +struct mfd_cell *cells;
We're not passing MFD data through OF to be fed back through MFD APIs.
It's generally considered better to device_get_match_data() on an enum, then populate MFD cells using that as a differentiator.
git grep compatible -- drivers/mfd | grep data
Quoted 19 lines
drivers/mfd/rohm-bd96801.c +7
-1+int num_cells; +int unlock_reg; +int unlock_val; +}; + +static const struct resource bd96801_reg_errb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"bd96801-otp-err" ),DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"bd96801-dbist-err" ),DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"bd96801-eep-err" ),@@ -98,7 +112,7 @@ static const struct resource regulator_errb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_SHDN_ERR_STAT, "bd96801-ldo7-shdn-err"), }; -static const struct resource regulator_intb_irqs[] = { +static const struct resource bd96801_reg_intb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"bd96801-core-thermal" ),DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"bd96801-buck1-overcurr-h" ),
drivers/mfd/rohm-bd96801.c static const struct regmap_config bd96801_regmap_config = { · line 362
Quoted 4 lines
drivers/mfd/rohm-bd96801.c +1
-0@@ -345,18 +359,37 @@ static const struct regmap_config bd96801_regmap_config = { .cache_type = REGCACHE_MAPLE, }; +static const struct bd968xx_chip_data bd96801_chip_data = {
Just call it 'struct bd968xx' then below instead of cd, use ddata.
git grep "cc =" -- drivers/mfd
VS
git grep "ddata =" -- drivers/mfd
Conforrrrrrmmm ... =;-)
Quoted 145 lines
drivers/mfd/rohm-bd96801.c +40
-24+ .errb_irqs = bd96801_reg_errb_irqs, + .intb_irqs = bd96801_reg_intb_irqs, + .num_errb_irqs = ARRAY_SIZE(bd96801_reg_errb_irqs), + .num_intb_irqs = ARRAY_SIZE(bd96801_reg_intb_irqs), + .errb_irq_chip = &bd96801_irq_chip_errb, + .intb_irq_chip = &bd96801_irq_chip_intb, + .regmap_config = &bd96801_regmap_config, + .cells = bd96801_cells, + .num_cells = ARRAY_SIZE(bd96801_cells), + .unlock_reg = BD96801_LOCK_REG, + .unlock_val = BD96801_UNLOCK, +}; +static int bd96801_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *intb_irq_data, *errb_irq_data;struct irq_domain *intb_domain, *errb_domain; +static const struct bd968xx_chip_data *cd;const struct fwnode_handle *fwnode;struct resource *regulator_res;struct resource wdg_irq;struct regmap *regmap; -int intb_irq, errb_irq, num_intb, num_errb =0 ; +int intb_irq, errb_irq, num_errb =0 ;int num_regu_irqs, wdg_irq_no;int i, ret; + cd =device_get_match_data (&i2c->dev); +if (!cd) +return -ENODEV ; + fwnode =dev_fwnode (&i2c->dev);if (!fwnode)return dev_err_probe (&i2c->dev, -EINVAL ,"Failed to find fwnode\n" );@@ -365,34 +398,32 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)if (intb_irq <0 )return dev_err_probe (&i2c->dev, intb_irq,"INTB IRQ not configured\n" ); - num_intb =ARRAY_SIZE (regulator_intb_irqs); -/* ERRB may be omitted if processor is powered by the PMIC */ errb_irq =fwnode_irq_get_byname (fwnode,"errb" ); -if (errb_irq <0 ) - errb_irq =0 ; +if (errb_irq == -EPROBE_DEFER ) +return errb_irq; -if (errb_irq) - num_errb =ARRAY_SIZE (regulator_errb_irqs); +if (errb_irq >0 ) + num_errb = cd->num_errb_irqs; - num_regu_irqs = num_intb + num_errb; + num_regu_irqs = cd->num_intb_irqs + num_errb; regulator_res =devm_kcalloc (&i2c->dev, num_regu_irqs,sizeof (*regulator_res),GFP_KERNEL );if (!regulator_res)return -ENOMEM ; - regmap =devm_regmap_init_i2c (i2c, &bd96801_regmap_config); + regmap =devm_regmap_init_i2c (i2c, cd->regmap_config);if (IS_ERR (regmap))return dev_err_probe (&i2c->dev,PTR_ERR (regmap),"Regmap initialization failed\n" ); - ret =regmap_write (regmap,BD96801_LOCK_REG ,BD96801_UNLOCK ); + ret =regmap_write (regmap, cd->unlock_reg, cd->unlock_val);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to unlock PMIC\n" ); ret =devm_regmap_add_irq_chip (&i2c->dev, regmap, intb_irq, -IRQF_ONESHOT ,0 , &bd96801_irq_chip_intb, +IRQF_ONESHOT ,0 , cd->intb_irq_chip, &intb_irq_data);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to add INTB IRQ chip\n" );@@ -404,24 +435,25 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)* has two domains so we do IRQ mapping here and provide the * already mapped IRQ numbers to sub-devices. */ -for (i =0 ; i < num_intb; i++) { +for (i =0 ; i < cd->num_intb_irqs; i++) {struct resource *res = ®ulator_res[i]; - *res = regulator_intb_irqs[i]; + *res = cd->intb_irqs[i]; res->start = res->end =irq_create_mapping (intb_domain, res->start); } wdg_irq_no =irq_create_mapping (intb_domain,BD96801_WDT_ERR_STAT ); wdg_irq =DEFINE_RES_IRQ_NAMED (wdg_irq_no,"bd96801-wdg" ); - bd96801_cells[WDG_CELL ].resources = &wdg_irq; - bd96801_cells[WDG_CELL ].num_resources =1 ; + + cd->cells[WDG_CELL ].resources = &wdg_irq; + cd->cells[WDG_CELL ].num_resources =1 ;if (!num_errb) goto skip_errb; ret =devm_regmap_add_irq_chip (&i2c->dev, regmap, errb_irq,IRQF_ONESHOT , -0 , &bd96801_irq_chip_errb, &errb_irq_data); +0 , cd->errb_irq_chip, &errb_irq_data);if (ret)return dev_err_probe (&i2c->dev, ret,"Failed to add ERRB IRQ chip\n" );@@ -429,18 +461,17 @@ static int bd96801_i2c_probe(struct i2c_client *i2c) errb_domain =regmap_irq_get_domain (errb_irq_data);for (i =0 ; i < num_errb; i++) { -struct resource *res = ®ulator_res[num_intb + i]; +struct resource *res = ®ulator_res[cd->num_intb_irqs + i]; - *res = regulator_errb_irqs[i]; + *res = cd->errb_irqs[i]; res->start = res->end =irq_create_mapping (errb_domain, res->start); } skip_errb: - bd96801_cells[REGULATOR_CELL ].resources = regulator_res; - bd96801_cells[REGULATOR_CELL ].num_resources = num_regu_irqs; - - ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , bd96801_cells, -ARRAY_SIZE (bd96801_cells),NULL ,0 ,NULL ); + cd->cells[REGULATOR_CELL ].resources = regulator_res; + cd->cells[REGULATOR_CELL ].num_resources = num_regu_irqs; + ret =devm_mfd_add_devices (&i2c->dev,PLATFORM_DEVID_AUTO , + cd->cells, cd->num_cells,NULL ,0 ,NULL );if (ret)dev_err_probe (&i2c->dev, ret,"Failed to create subdevices\n" );@@ -448,7 +479,7 @@ static int bd96801_i2c_probe(struct i2c_client *i2c) }static const struct of_device_id bd96801_of_match[] = { - { .compatible ="rohm,bd96801" , }, + { .compatible ="rohm,bd96801" , .data = &bd96801_chip_data, }, { } };MODULE_DEVICE_TABLE (of, bd96801_of_match);Signature · 1 line
2.48.1
Signature · 1 line
Lee Jones [李琼斯]
Matti Vaittinen
maintainerRe: [PATCH 05/14] mfd: rohm-bd96801: Add chip info
Quoted 32 lines · Lee Jones
Quoted 17 lines · Matti Vaittinen
Prepare for adding support for BD96802 which is very similar to BD96801. Separate chip specific data into own structure which can be picked to be used by the device-tree.
Signed-off-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd96801.c | 83 ++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 26 deletions(-)drivers/mfd/rohm-bd96801.c +0
-0@@ -40,7 +40,21 @@#include <linux/mfd/rohm-bd96801.h> #include <linux/mfd/rohm-generic.h> drivers/mfd/rohm-bd96801.c line 51
Quoted 10 lines
drivers/mfd/rohm-bd96801.c +9
-1-static const struct resource regulator_errb_irqs[] = { +struct bd968xx_chip_data { +const struct resource *errb_irqs; +const struct resource *intb_irqs; +int num_errb_irqs; +int num_intb_irqs; +const struct regmap_irq_chip *errb_irq_chip; +const struct regmap_irq_chip *intb_irq_chip; +const struct regmap_config *regmap_config; +struct mfd_cell *cells;We're not passing MFD data through OF to be fed back through MFD APIs.
Quoted 2 lines
It's generally considered better to
device_get_match_data()on an enum, then populate MFD cells using that as a differentiator.
Or, at least someone has done this at the beginning and it got copied all over the place, right? ;) Sometimes we just need to challenge the status quo to develop ;)
I can go back to enum + switch - case in probe, and pick the correct data there. Done that before as well. It's just that during my journey to some other subsystems, I've realized people can often just skip the enum and switch - case, making things a tad simpler :)
Well, not a big deal to me. I suppose it has some value to keep things consistent inside a subsystem - and I'm not offering to drop the switch cases from all of the drivers :p
TL; DR - Ok.
Quoted 28 lines
git grep compatible --
drivers/mfd| grep dataQuoted 19 lines
drivers/mfd/rohm-bd96801.c +7
-1+int num_cells; +int unlock_reg; +int unlock_val; +}; + +static const struct resource bd96801_reg_errb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"bd96801-otp-err" ),DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"bd96801-dbist-err" ),DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"bd96801-eep-err" ),@@ -98,7 +112,7 @@ static const struct resource regulator_errb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_SHDN_ERR_STAT, "bd96801-ldo7-shdn-err"), }; -static const struct resource regulator_intb_irqs[] = { +static const struct resource bd96801_reg_intb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"bd96801-core-thermal" ),DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"bd96801-buck1-overcurr-h" ),drivers/mfd/rohm-bd96801.c static const struct regmap_config bd96801_regmap_config = { · line 362
Quoted 4 lines
drivers/mfd/rohm-bd96801.c +1
-0@@ -345,18 +359,37 @@ static const struct regmap_config bd96801_regmap_config = { .cache_type = REGCACHE_MAPLE, }; +static const struct bd968xx_chip_data bd96801_chip_data = {Just call it 'struct bd968xx' then below instead of cd, use ddata.
Quoted 7 lines
git grep "cc =" --
drivers/mfdVS
git grep "ddata =" --
drivers/mfdConforrrrrrmmm ... =;-)
I've lived through the depression of the early 90's in Finland. Learned how to avoid wasting things - especially letters. Wouldn't guess when reading my review replies, right?
...Ok.
Thanks for the review :) Much appreciated.
Yours,
-- Matti
Lee Jones
maintainerRe: [PATCH 05/14] mfd: rohm-bd96801: Add chip info
Quoted 32 lines · Matti Vaittinen
Quoted 31 lines · Lee Jones
Quoted 16 lines · Matti Vaittinen
Prepare for adding support for BD96802 which is very similar to BD96801. Separate chip specific data into own structure which can be picked to be used by the device-tree.
Signed-off-by Matti Vaittinen <[email protected]>--- drivers/mfd/rohm-bd96801.c | 83 ++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 26 deletions(-)drivers/mfd/rohm-bd96801.c +0
-0@@ -40,7 +40,21 @@#include <linux/mfd/rohm-bd96801.h> #include <linux/mfd/rohm-generic.h> drivers/mfd/rohm-bd96801.c line 50
Quoted 10 lines
drivers/mfd/rohm-bd96801.c +9
-1-static const struct resource regulator_errb_irqs[] = { +struct bd968xx_chip_data { +const struct resource *errb_irqs; +const struct resource *intb_irqs; +int num_errb_irqs; +int num_intb_irqs; +const struct regmap_irq_chip *errb_irq_chip; +const struct regmap_irq_chip *intb_irq_chip; +const struct regmap_config *regmap_config; +struct mfd_cell *cells;We're not passing MFD data through OF to be fed back through MFD APIs.
Quoted 6 lines
Quoted 2 lines
It's generally considered better to
device_get_match_data()on an enum, then populate MFD cells using that as a differentiator.Or, at least someone has done this at the beginning and it got copied all over the place, right? ;) Sometimes we just need to challenge the status quo to develop ;)
This is not one of those times.
I've never allowed mixing platform init strategies (arch-plat, OF, ACPI, MFD).
Quoted 44 lines
I can go back to enum + switch - case in probe, and pick the correct data there. Done that before as well. It's just that during my journey to some other subsystems, I've realized people can often just skip the enum and switch - case, making things a tad simpler :)
Well, not a big deal to me. I suppose it has some value to keep things consistent inside a subsystem - and I'm not offering to drop the switch cases from all of the drivers :p
TL; DR - Ok.
Quoted 25 lines
git grep compatible --
drivers/mfd| grep dataQuoted 17 lines
drivers/mfd/rohm-bd96801.c +7
-1+int num_cells; +int unlock_reg; +int unlock_val; +}; + +static const struct resource bd96801_reg_errb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"bd96801-otp-err" ),DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"bd96801-dbist-err" ),DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"bd96801-eep-err" ),@@ -98,7 +112,7 @@ static const struct resource regulator_errb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_SHDN_ERR_STAT, "bd96801-ldo7-shdn-err"), }; -static const struct resource regulator_intb_irqs[] = { +static const struct resource bd96801_reg_intb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"bd96801-core-thermal" ),DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"bd96801-buck1-overcurr-h" ),drivers/mfd/rohm-bd96801.c static const struct regmap_config bd96801_regmap_config = { · line 361
Quoted 3 lines
drivers/mfd/rohm-bd96801.c +1
-0@@ -345,18 +359,37 @@ static const struct regmap_config bd96801_regmap_config = { .cache_type = REGCACHE_MAPLE, }; +static const struct bd968xx_chip_data bd96801_chip_data = {Just call it 'struct bd968xx' then below instead of cd, use ddata.
Quoted 7 lines
git grep "cc =" --
drivers/mfdVS
git grep "ddata =" --
drivers/mfdConforrrrrrmmm ... =;-)
Quoted 7 lines
I've lived through the depression of the early 90's in Finland. Learned how to avoid wasting things - especially letters. Wouldn't guess when reading my review replies, right?
...Ok.
Thanks for the review :) Much appreciated.
NP
Signature · 1 line
Lee Jones [李琼斯]
Matti Vaittinen
maintainerPATCH 6/14 mfd: bd96801: Drop IC name from the regulator IRQ resources
In reply to Matti VaittinenThe resources generated in the BD96801 MFD driver are only visible to the sub-drivers whose resource fields they are added. This makes abbreviating the resource name with the IC name pointless. It just adds confusion in those sub-drivers which do not really care the exact model that generates the IRQ but just want to know the purpose IRQ was generated for. This is a preparatory fix to simplify adding support for ROHM BD96802 PMIC.
Signed-off-by Matti Vaittinen <[email protected]>
---
NOTE: This commit shall break the bd96801-regulator driver unless a follow-up regulator commit is also included. Compilation should not be broken though so squashing should not be mandatory as long as both this MFD commit and the regulator commit will end up in same release.
--- drivers/mfd/rohm-bd96801.c | 187 +++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 93 deletions(-)
drivers/mfd/rohm-bd96801.c +94 -93
@@ -55,105 +55,106 @@ struct bd968xx_chip_data { };static const struct resource bd96801_reg_errb_irqs[] = { -DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"bd96801-otp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"bd96801-dbist-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"bd96801-eep-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_ABIST_ERR_STAT ,"bd96801-abist-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_PRSTB_ERR_STAT ,"bd96801-prstb-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_DRMOS1_ERR_STAT ,"bd96801-drmoserr1" ), -DEFINE_RES_IRQ_NAMED (BD96801_DRMOS2_ERR_STAT ,"bd96801-drmoserr2" ), -DEFINE_RES_IRQ_NAMED (BD96801_SLAVE_ERR_STAT ,"bd96801-slave-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_VREF_ERR_STAT ,"bd96801-vref-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_TSD_ERR_STAT ,"bd96801-tsd" ), -DEFINE_RES_IRQ_NAMED (BD96801_UVLO_ERR_STAT ,"bd96801-uvlo-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_OVLO_ERR_STAT ,"bd96801-ovlo-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_OSC_ERR_STAT ,"bd96801-osc-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_PON_ERR_STAT ,"bd96801-pon-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_POFF_ERR_STAT ,"bd96801-poff-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_CMD_SHDN_ERR_STAT ,"bd96801-cmd-shdn-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_OTP_ERR_STAT ,"otp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_DBIST_ERR_STAT ,"dbist-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_EEP_ERR_STAT ,"eep-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_ABIST_ERR_STAT ,"abist-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_PRSTB_ERR_STAT ,"prstb-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_DRMOS1_ERR_STAT ,"drmoserr1" ), +DEFINE_RES_IRQ_NAMED (BD96801_DRMOS2_ERR_STAT ,"drmoserr2" ), +DEFINE_RES_IRQ_NAMED (BD96801_SLAVE_ERR_STAT ,"slave-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_VREF_ERR_STAT ,"vref-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_TSD_ERR_STAT ,"tsd" ), +DEFINE_RES_IRQ_NAMED (BD96801_UVLO_ERR_STAT ,"uvlo-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_OVLO_ERR_STAT ,"ovlo-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_OSC_ERR_STAT ,"osc-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_PON_ERR_STAT ,"pon-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_POFF_ERR_STAT ,"poff-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_CMD_SHDN_ERR_STAT ,"cmd-shdn-err" ),DEFINE_RES_IRQ_NAMED (BD96801_INT_PRSTB_WDT_ERR ,"bd96801-prstb-wdt-err" ),DEFINE_RES_IRQ_NAMED (BD96801_INT_CHIP_IF_ERR ,"bd96801-chip-if-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_INT_SHDN_ERR_STAT ,"bd96801-int-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_PVIN_ERR_STAT ,"bd96801-buck1-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OVP_ERR_STAT ,"bd96801-buck1-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_UVP_ERR_STAT ,"bd96801-buck1-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_SHDN_ERR_STAT ,"bd96801-buck1-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_PVIN_ERR_STAT ,"bd96801-buck2-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OVP_ERR_STAT ,"bd96801-buck2-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_UVP_ERR_STAT ,"bd96801-buck2-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_SHDN_ERR_STAT ,"bd96801-buck2-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_PVIN_ERR_STAT ,"bd96801-buck3-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OVP_ERR_STAT ,"bd96801-buck3-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_UVP_ERR_STAT ,"bd96801-buck3-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_SHDN_ERR_STAT ,"bd96801-buck3-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_PVIN_ERR_STAT ,"bd96801-buck4-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OVP_ERR_STAT ,"bd96801-buck4-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_UVP_ERR_STAT ,"bd96801-buck4-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_SHDN_ERR_STAT ,"bd96801-buck4-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_PVIN_ERR_STAT ,"bd96801-ldo5-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OVP_ERR_STAT ,"bd96801-ldo5-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_UVP_ERR_STAT ,"bd96801-ldo5-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_SHDN_ERR_STAT ,"bd96801-ldo5-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_PVIN_ERR_STAT ,"bd96801-ldo6-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OVP_ERR_STAT ,"bd96801-ldo6-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_UVP_ERR_STAT ,"bd96801-ldo6-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_SHDN_ERR_STAT ,"bd96801-ldo6-shdn-err" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_PVIN_ERR_STAT ,"bd96801-ldo7-pvin-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OVP_ERR_STAT ,"bd96801-ldo7-ovp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_UVP_ERR_STAT ,"bd96801-ldo7-uvp-err" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_SHDN_ERR_STAT ,"bd96801-ldo7-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_INT_SHDN_ERR_STAT ,"int-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_PVIN_ERR_STAT ,"buck1-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OVP_ERR_STAT ,"buck1-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_UVP_ERR_STAT ,"buck1-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_SHDN_ERR_STAT ,"buck1-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_PVIN_ERR_STAT ,"buck2-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OVP_ERR_STAT ,"buck2-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_UVP_ERR_STAT ,"buck2-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_SHDN_ERR_STAT ,"buck2-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_PVIN_ERR_STAT ,"buck3-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OVP_ERR_STAT ,"buck3-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_UVP_ERR_STAT ,"buck3-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_SHDN_ERR_STAT ,"buck3-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_PVIN_ERR_STAT ,"buck4-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OVP_ERR_STAT ,"buck4-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_UVP_ERR_STAT ,"buck4-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_SHDN_ERR_STAT ,"buck4-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_PVIN_ERR_STAT ,"ldo5-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OVP_ERR_STAT ,"ldo5-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_UVP_ERR_STAT ,"ldo5-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_SHDN_ERR_STAT ,"ldo5-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_PVIN_ERR_STAT ,"ldo6-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OVP_ERR_STAT ,"ldo6-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_UVP_ERR_STAT ,"ldo6-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_SHDN_ERR_STAT ,"ldo6-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_PVIN_ERR_STAT ,"ldo7-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OVP_ERR_STAT ,"ldo7-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_UVP_ERR_STAT ,"ldo7-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_SHDN_ERR_STAT ,"ldo7-shdn-err" ), };static const struct resource bd96801_reg_intb_irqs[] = { -DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"bd96801-core-thermal" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"bd96801-buck1-overcurr-h" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPL_STAT ,"bd96801-buck1-overcurr-l" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPN_STAT ,"bd96801-buck1-overcurr-n" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OVD_STAT ,"bd96801-buck1-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_UVD_STAT ,"bd96801-buck1-undervolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_TW_CH_STAT ,"bd96801-buck1-thermal" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPH_STAT ,"bd96801-buck2-overcurr-h" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPL_STAT ,"bd96801-buck2-overcurr-l" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPN_STAT ,"bd96801-buck2-overcurr-n" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OVD_STAT ,"bd96801-buck2-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_UVD_STAT ,"bd96801-buck2-undervolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_TW_CH_STAT ,"bd96801-buck2-thermal" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPH_STAT ,"bd96801-buck3-overcurr-h" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPL_STAT ,"bd96801-buck3-overcurr-l" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPN_STAT ,"bd96801-buck3-overcurr-n" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OVD_STAT ,"bd96801-buck3-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_UVD_STAT ,"bd96801-buck3-undervolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_TW_CH_STAT ,"bd96801-buck3-thermal" ), - -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPH_STAT ,"bd96801-buck4-overcurr-h" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPL_STAT ,"bd96801-buck4-overcurr-l" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPN_STAT ,"bd96801-buck4-overcurr-n" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OVD_STAT ,"bd96801-buck4-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_UVD_STAT ,"bd96801-buck4-undervolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_TW_CH_STAT ,"bd96801-buck4-thermal" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OCPH_STAT ,"bd96801-ldo5-overcurr" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OVD_STAT ,"bd96801-ldo5-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO5_UVD_STAT ,"bd96801-ldo5-undervolt" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OCPH_STAT ,"bd96801-ldo6-overcurr" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OVD_STAT ,"bd96801-ldo6-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO6_UVD_STAT ,"bd96801-ldo6-undervolt" ), - -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OCPH_STAT ,"bd96801-ldo7-overcurr" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OVD_STAT ,"bd96801-ldo7-overvolt" ), -DEFINE_RES_IRQ_NAMED (BD96801_LDO7_UVD_STAT ,"bd96801-ldo7-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"core-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPH_STAT ,"buck1-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPL_STAT ,"buck1-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OCPN_STAT ,"buck1-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_OVD_STAT ,"buck1-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_UVD_STAT ,"buck1-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK1_TW_CH_STAT ,"buck1-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPH_STAT ,"buck2-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPL_STAT ,"buck2-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OCPN_STAT ,"buck2-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_OVD_STAT ,"buck2-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_UVD_STAT ,"buck2-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK2_TW_CH_STAT ,"buck2-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPH_STAT ,"buck3-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPL_STAT ,"buck3-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OCPN_STAT ,"buck3-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_OVD_STAT ,"buck3-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_UVD_STAT ,"buck3-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK3_TW_CH_STAT ,"buck3-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPH_STAT ,"buck4-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPL_STAT ,"buck4-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OCPN_STAT ,"buck4-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_OVD_STAT ,"buck4-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_UVD_STAT ,"buck4-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_BUCK4_TW_CH_STAT ,"buck4-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OCPH_STAT ,"ldo5-overcurr" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_OVD_STAT ,"ldo5-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO5_UVD_STAT ,"ldo5-undervolt" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OCPH_STAT ,"ldo6-overcurr" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_OVD_STAT ,"ldo6-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO6_UVD_STAT ,"ldo6-undervolt" ), + +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OCPH_STAT ,"ldo7-overcurr" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_OVD_STAT ,"ldo7-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96801_LDO7_UVD_STAT ,"ldo7-undervolt" ), };enum {
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 7/14 regulator: bd96801: Drop IC name from the IRQ resources
In reply to Matti VaittinenThe resources generated in the BD96801 MFD driver are only visible to the sub-drivers whose resource fields they are added. This makes abbreviating the resource name with the IC name pointless. It just adds confusion in those sub-drivers which do not really care the exact model that generates the IRQ but just want to know the purpose IRQ was generated for. Thus, as a preparatory fix to simplify adding support for ROHM BD96802 PMIC the IC name "bd96801-" prefix was dropped from the IRQ resource names. Adapt the regulator driver to this change.
Signed-off-by Matti Vaittinen <[email protected]>
---
NOTE: This commit shall break the driver unless 5ba9557e5d41 ("mfd: bd96801: Drop IC name from the IRQ resources") is also included. Compilation should not be broken though so squashing should not be mandatory as long as both this regiulator commit and the MFD commit will end up in same release.
--- drivers/regulator/bd96801-regulator.c | 83 +++++++++++++-------------- 1 file changed, 40 insertions(+), 43 deletions(-)
drivers/regulator/bd96801-regulator.c +40 -43
@@ -198,89 +198,89 @@ struct bd96801_irqinfo {static const struct bd96801_irqinfo buck1_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"buck1-over-curr-h" ,500 , -"bd96801-buck1-overcurr-h" ), +"buck1-overcurr-h" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck1-over-curr-l" ,500 , -"bd96801-buck1-overcurr-l" ), +"buck1-overcurr-l" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck1-over-curr-n" ,500 , -"bd96801-buck1-overcurr-n" ), +"buck1-overcurr-n" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"buck1-over-voltage" ,500 , -"bd96801-buck1-overvolt" ), +"buck1-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"buck1-under-voltage" ,500 , -"bd96801-buck1-undervolt" ), +"buck1-undervolt" ),BD96801_IRQINFO (BD96801_PROT_TEMP ,"buck1-over-temp" ,500 , -"bd96801-buck1-thermal" ) +"buck1-thermal" ) };static const struct bd96801_irqinfo buck2_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"buck2-over-curr-h" ,500 , -"bd96801-buck2-overcurr-h" ), +"buck2-overcurr-h" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck2-over-curr-l" ,500 , -"bd96801-buck2-overcurr-l" ), +"buck2-overcurr-l" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck2-over-curr-n" ,500 , -"bd96801-buck2-overcurr-n" ), +"buck2-overcurr-n" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"buck2-over-voltage" ,500 , -"bd96801-buck2-overvolt" ), +"buck2-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"buck2-under-voltage" ,500 , -"bd96801-buck2-undervolt" ), +"buck2-undervolt" ),BD96801_IRQINFO (BD96801_PROT_TEMP ,"buck2-over-temp" ,500 , -"bd96801-buck2-thermal" ) +"buck2-thermal" ) };static const struct bd96801_irqinfo buck3_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"buck3-over-curr-h" ,500 , -"bd96801-buck3-overcurr-h" ), +"buck3-overcurr-h" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck3-over-curr-l" ,500 , -"bd96801-buck3-overcurr-l" ), +"buck3-overcurr-l" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck3-over-curr-n" ,500 , -"bd96801-buck3-overcurr-n" ), +"buck3-overcurr-n" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"buck3-over-voltage" ,500 , -"bd96801-buck3-overvolt" ), +"buck3-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"buck3-under-voltage" ,500 , -"bd96801-buck3-undervolt" ), +"buck3-undervolt" ),BD96801_IRQINFO (BD96801_PROT_TEMP ,"buck3-over-temp" ,500 , -"bd96801-buck3-thermal" ) +"buck3-thermal" ) };static const struct bd96801_irqinfo buck4_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"buck4-over-curr-h" ,500 , -"bd96801-buck4-overcurr-h" ), +"buck4-overcurr-h" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck4-over-curr-l" ,500 , -"bd96801-buck4-overcurr-l" ), +"buck4-overcurr-l" ),BD96801_IRQINFO (BD96801_PROT_OCP ,"buck4-over-curr-n" ,500 , -"bd96801-buck4-overcurr-n" ), +"buck4-overcurr-n" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"buck4-over-voltage" ,500 , -"bd96801-buck4-overvolt" ), +"buck4-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"buck4-under-voltage" ,500 , -"bd96801-buck4-undervolt" ), +"buck4-undervolt" ),BD96801_IRQINFO (BD96801_PROT_TEMP ,"buck4-over-temp" ,500 , -"bd96801-buck4-thermal" ) +"buck4-thermal" ) };static const struct bd96801_irqinfo ldo5_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"ldo5-overcurr" ,500 , -"bd96801-ldo5-overcurr" ), +"ldo5-overcurr" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"ldo5-over-voltage" ,500 , -"bd96801-ldo5-overvolt" ), +"ldo5-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"ldo5-under-voltage" ,500 , -"bd96801-ldo5-undervolt" ), +"ldo5-undervolt" ), };static const struct bd96801_irqinfo ldo6_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"ldo6-overcurr" ,500 , -"bd96801-ldo6-overcurr" ), +"ldo6-overcurr" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"ldo6-over-voltage" ,500 , -"bd96801-ldo6-overvolt" ), +"ldo6-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"ldo6-under-voltage" ,500 , -"bd96801-ldo6-undervolt" ), +"ldo6-undervolt" ), };static const struct bd96801_irqinfo ldo7_irqinfo[] = {BD96801_IRQINFO (BD96801_PROT_OCP ,"ldo7-overcurr" ,500 , -"bd96801-ldo7-overcurr" ), +"ldo7-overcurr" ),BD96801_IRQINFO (BD96801_PROT_OVP ,"ldo7-over-voltage" ,500 , -"bd96801-ldo7-overvolt" ), +"ldo7-overvolt" ),BD96801_IRQINFO (BD96801_PROT_UVP ,"ldo7-under-voltage" ,500 , -"bd96801-ldo7-undervolt" ), +"ldo7-undervolt" ), };struct bd96801_irq_desc {
@@ -741,8 +741,7 @@ static int bd96801_rdev_errb_irqs(struct platform_device *pdev,int i;void *retp;static const char *const single_out_errb_irqs[] = { -"bd96801-%s-pvin-err" ,"bd96801-%s-ovp-err" , -"bd96801-%s-uvp-err" ,"bd96801-%s-shdn-err" , +"%s-pvin-err" ,"%s-ovp-err" ,"%s-uvp-err" ,"%s-shdn-err" , };for (i =0 ; i <ARRAY_SIZE (single_out_errb_irqs); i++) {
@@ -779,12 +778,10 @@ static int bd96801_global_errb_irqs(struct platform_device *pdev,int i, num_irqs;void *retp;static const char *const global_errb_irqs[] = { -"bd96801-otp-err" ,"bd96801-dbist-err" ,"bd96801-eep-err" , -"bd96801-abist-err" ,"bd96801-prstb-err" ,"bd96801-drmoserr1" , -"bd96801-drmoserr2" ,"bd96801-slave-err" ,"bd96801-vref-err" , -"bd96801-tsd" ,"bd96801-uvlo-err" ,"bd96801-ovlo-err" , -"bd96801-osc-err" ,"bd96801-pon-err" ,"bd96801-poff-err" , -"bd96801-cmd-shdn-err" ,"bd96801-int-shdn-err" +"otp-err" ,"dbist-err" ,"eep-err" ,"abist-err" ,"prstb-err" , +"drmoserr1" ,"drmoserr2" ,"slave-err" ,"vref-err" ,"tsd" , +"uvlo-err" ,"ovlo-err" ,"osc-err" ,"pon-err" ,"poff-err" , +"cmd-shdn-err" ,"int-shdn-err" }; num_irqs =ARRAY_SIZE (global_errb_irqs);
@@ -956,12 +953,12 @@ static int bd96801_probe(struct platform_device *pdev)if (temp_notif_ldos) {int irq;struct regulator_irq_desc tw_desc = { - .name ="bd96801-core-thermal" , + .name ="core-thermal" , .irq_off_ms =500 , .map_event = ldo_map_notif, }; - irq =platform_get_irq_byname (pdev,"bd96801-core-thermal" ); + irq =platform_get_irq_byname (pdev,"core-thermal" );if (irq <0 )return irq;
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 8/14 mfd: rohm-bd96801: Support ROHM BD96802
In reply to Matti VaittinenThe ROHM BD96802 PMIC looks from software point of view a lot like ROHM BD96801 PMIC. Just with reduced number of voltage rails. Both PMICs provide two physical IRQ lines referred as INTB and ERRB and contain blocks implementing regulator controls and a weatchdog. Hence it makes sense to use same MFD core for both PMICs.
Add support for ROHM BD96802 scalable companion PMIC to the BD96801 core driver.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/mfd/rohm-bd96801.c | 238 ++++++++++++++++++++++++++++++- include/linux/mfd/rohm-bd96801.h | 2 + include/linux/mfd/rohm-bd96802.h | 74 ++++++++++ 3 files changed, 309 insertions(+), 5 deletions(-) create mode 100644 include/linux/mfd/rohm-bd96802.h
drivers/mfd/rohm-bd96801.c +233 -5
@@ -38,6 +38,7 @@#include <linux/types.h> #include <linux/mfd/rohm-bd96801.h> +#include <linux/mfd/rohm-bd96802.h> #include <linux/mfd/rohm-generic.h> struct bd968xx_chip_data {
@@ -113,6 +114,36 @@ static const struct resource bd96801_reg_errb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_SHDN_ERR_STAT, "ldo7-shdn-err"), }; +static const struct resource bd96802_reg_errb_irqs[] = { +DEFINE_RES_IRQ_NAMED (BD96802_OTP_ERR_STAT ,"otp-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_DBIST_ERR_STAT ,"dbist-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_EEP_ERR_STAT ,"eep-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_ABIST_ERR_STAT ,"abist-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_PRSTB_ERR_STAT ,"prstb-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_DRMOS1_ERR_STAT ,"drmoserr1" ), +DEFINE_RES_IRQ_NAMED (BD96802_DRMOS1_ERR_STAT ,"drmoserr2" ), +DEFINE_RES_IRQ_NAMED (BD96802_SLAVE_ERR_STAT ,"slave-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_VREF_ERR_STAT ,"vref-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_TSD_ERR_STAT ,"tsd" ), +DEFINE_RES_IRQ_NAMED (BD96802_UVLO_ERR_STAT ,"uvlo-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_OVLO_ERR_STAT ,"ovlo-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_OSC_ERR_STAT ,"osc-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_PON_ERR_STAT ,"pon-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_POFF_ERR_STAT ,"poff-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_CMD_SHDN_ERR_STAT ,"cmd-shdn-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_INT_SHDN_ERR_STAT ,"int-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_PVIN_ERR_STAT ,"buck1-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_OVP_ERR_STAT ,"buck1-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_UVP_ERR_STAT ,"buck1-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_SHDN_ERR_STAT ,"buck1-shdn-err" ), + +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_PVIN_ERR_STAT ,"buck2-pvin-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_OVP_ERR_STAT ,"buck2-ovp-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_UVP_ERR_STAT ,"buck2-uvp-err" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_SHDN_ERR_STAT ,"buck2-shdn-err" ), +}; +static const struct resource bd96801_reg_intb_irqs[] = {DEFINE_RES_IRQ_NAMED (BD96801_TW_STAT ,"core-thermal" ),
@@ -157,6 +188,24 @@ static const struct resource bd96801_reg_intb_irqs[] = { DEFINE_RES_IRQ_NAMED(BD96801_LDO7_UVD_STAT, "ldo7-undervolt"), }; +static const struct resource bd96802_reg_intb_irqs[] = { +DEFINE_RES_IRQ_NAMED (BD96802_TW_STAT ,"core-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_OCPH_STAT ,"buck1-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_OCPL_STAT ,"buck1-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_OCPN_STAT ,"buck1-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_OVD_STAT ,"buck1-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_UVD_STAT ,"buck1-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK1_TW_CH_STAT ,"buck1-thermal" ), + +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_OCPH_STAT ,"buck2-overcurr-h" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_OCPL_STAT ,"buck2-overcurr-l" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_OCPN_STAT ,"buck2-overcurr-n" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_OVD_STAT ,"buck2-overvolt" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_UVD_STAT ,"buck2-undervolt" ), +DEFINE_RES_IRQ_NAMED (BD96802_BUCK2_TW_CH_STAT ,"buck2-thermal" ), +}; +enum {WDG_CELL =0 ,REGULATOR_CELL ,
@@ -167,6 +216,11 @@ static struct mfd_cell bd96801_cells[] = { [REGULATOR_CELL] = { .name = "bd96801-regulator", }, }; +static struct mfd_cell bd96802_cells[] = { + [WDG_CELL ] = { .name ="bd96801-wdt" , }, + [REGULATOR_CELL ] = { .name ="bd96802-regulator" , }, +}; +static const struct regmap_range bd96801_volatile_ranges[] = {/* Status registers */ regmap_reg_range (BD96801_REG_WD_FEED ,BD96801_REG_WD_FAILCOUNT ),
@@ -184,11 +238,28 @@ static const struct regmap_range bd96801_volatile_ranges[] = { regmap_reg_range(BD96801_LDO5_VOL_LVL_REG, BD96801_LDO7_VOL_LVL_REG), }; -static const struct regmap_access_table volatile_regs = { +static const struct regmap_range bd96802_volatile_ranges[] = { +/* Status regs */ +regmap_reg_range (BD96801_REG_WD_FEED ,BD96801_REG_WD_FAILCOUNT ), +regmap_reg_range (BD96801_REG_WD_ASK ,BD96801_REG_WD_ASK ), +regmap_reg_range (BD96801_REG_WD_STATUS ,BD96801_REG_WD_STATUS ), +regmap_reg_range (BD96801_REG_PMIC_STATE ,BD96801_REG_INT_BUCK2_ERRB ), +regmap_reg_range (BD96801_REG_INT_SYS_INTB ,BD96801_REG_INT_BUCK2_INTB ), +/* Registers which do not update value unless PMIC is in STBY */ +regmap_reg_range (BD96801_REG_SSCG_CTRL ,BD96801_REG_SHD_INTB ), +regmap_reg_range (BD96801_REG_BUCK_OVP ,BD96801_REG_BOOT_OVERTIME ), +}; + +static const struct regmap_access_table bd96801_volatile_regs = { .yes_ranges = bd96801_volatile_ranges, .n_yes_ranges =ARRAY_SIZE (bd96801_volatile_ranges), }; +static const struct regmap_access_table bd96802_volatile_regs = { + .yes_ranges = bd96802_volatile_ranges, + .n_yes_ranges =ARRAY_SIZE (bd96802_volatile_ranges), +}; +/* * For ERRB we need main register bit mapping as bit(0) indicates active IRQ * in one of the first 3 sub IRQ registers, For INTB we can use default 1 to 1
@@ -203,7 +274,7 @@ static unsigned int bit5_offsets[] = {7}; /* LDO 5 stat */static unsigned int bit6_offsets[] = {8 };/* LDO 6 stat */ static unsigned int bit7_offsets[] = {9 };/* LDO 7 stat */ -static const struct regmap_irq_sub_irq_map errb_sub_irq_offsets[] = { +static const struct regmap_irq_sub_irq_map bd96801_errb_sub_irq_offsets[] = {REGMAP_IRQ_MAIN_REG_OFFSET (bit0_offsets),REGMAP_IRQ_MAIN_REG_OFFSET (bit1_offsets),REGMAP_IRQ_MAIN_REG_OFFSET (bit2_offsets),
@@ -214,6 +285,12 @@ static const struct regmap_irq_sub_irq_map errb_sub_irq_offsets[] = { REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), }; +static const struct regmap_irq_sub_irq_map bd96802_errb_sub_irq_offsets[] = { +REGMAP_IRQ_MAIN_REG_OFFSET (bit0_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit1_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bit2_offsets), +}; +static const struct regmap_irq bd96801_errb_irqs[] = {/* Reg 0x52 Fatal ERRB1 */ REGMAP_IRQ_REG (BD96801_OTP_ERR_STAT ,0 ,BD96801_OTP_ERR_MASK ),
@@ -274,6 +351,39 @@ static const struct regmap_irq bd96801_errb_irqs[] = { REGMAP_IRQ_REG(BD96801_LDO7_SHDN_ERR_STAT, 9, BD96801_OUT_SHDN_ERR_MASK), }; +static const struct regmap_irq bd96802_errb_irqs[] = { +/* Reg 0x52 Fatal ERRB1 */ +REGMAP_IRQ_REG (BD96802_OTP_ERR_STAT ,0 ,BD96801_OTP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_DBIST_ERR_STAT ,0 ,BD96801_DBIST_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_EEP_ERR_STAT ,0 ,BD96801_EEP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_ABIST_ERR_STAT ,0 ,BD96801_ABIST_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_PRSTB_ERR_STAT ,0 ,BD96801_PRSTB_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_DRMOS1_ERR_STAT ,0 ,BD96801_DRMOS1_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_DRMOS2_ERR_STAT ,0 ,BD96801_DRMOS2_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_SLAVE_ERR_STAT ,0 ,BD96801_SLAVE_ERR_MASK ), +/* 0x53 Fatal ERRB2 */ +REGMAP_IRQ_REG (BD96802_VREF_ERR_STAT ,1 ,BD96801_VREF_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_TSD_ERR_STAT ,1 ,BD96801_TSD_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_UVLO_ERR_STAT ,1 ,BD96801_UVLO_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_OVLO_ERR_STAT ,1 ,BD96801_OVLO_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_OSC_ERR_STAT ,1 ,BD96801_OSC_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_PON_ERR_STAT ,1 ,BD96801_PON_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_POFF_ERR_STAT ,1 ,BD96801_POFF_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_CMD_SHDN_ERR_STAT ,1 ,BD96801_CMD_SHDN_ERR_MASK ), +/* 0x54 Fatal INTB shadowed to ERRB */ +REGMAP_IRQ_REG (BD96802_INT_SHDN_ERR_STAT ,2 ,BD96801_INT_SHDN_ERR_MASK ), +/* Reg 0x55 BUCK1 ERR IRQs */ +REGMAP_IRQ_REG (BD96802_BUCK1_PVIN_ERR_STAT ,3 ,BD96801_OUT_PVIN_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_OVP_ERR_STAT ,3 ,BD96801_OUT_OVP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_UVP_ERR_STAT ,3 ,BD96801_OUT_UVP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_SHDN_ERR_STAT ,3 ,BD96801_OUT_SHDN_ERR_MASK ), +/* Reg 0x56 BUCK2 ERR IRQs */ +REGMAP_IRQ_REG (BD96802_BUCK2_PVIN_ERR_STAT ,4 ,BD96801_OUT_PVIN_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_OVP_ERR_STAT ,4 ,BD96801_OUT_OVP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_UVP_ERR_STAT ,4 ,BD96801_OUT_UVP_ERR_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_SHDN_ERR_STAT ,4 ,BD96801_OUT_SHDN_ERR_MASK ), +}; +static const struct regmap_irq bd96801_intb_irqs[] = {/* STATUS SYSTEM INTB */ REGMAP_IRQ_REG (BD96801_TW_STAT ,0 ,BD96801_TW_STAT_MASK ),
@@ -322,6 +432,69 @@ static const struct regmap_irq bd96801_intb_irqs[] = { REGMAP_IRQ_REG(BD96801_LDO7_UVD_STAT, 7, BD96801_LDO_UVD_STAT_MASK), }; +static const struct regmap_irq bd96802_intb_irqs[] = { +/* STATUS SYSTEM INTB */ +REGMAP_IRQ_REG (BD96802_TW_STAT ,0 ,BD96801_TW_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_WDT_ERR_STAT ,0 ,BD96801_WDT_ERR_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_I2C_ERR_STAT ,0 ,BD96801_I2C_ERR_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_CHIP_IF_ERR_STAT ,0 ,BD96801_CHIP_IF_ERR_STAT_MASK ), +/* STATUS BUCK1 INTB */ +REGMAP_IRQ_REG (BD96802_BUCK1_OCPH_STAT ,1 ,BD96801_BUCK_OCPH_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_OCPL_STAT ,1 ,BD96801_BUCK_OCPL_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_OCPN_STAT ,1 ,BD96801_BUCK_OCPN_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_OVD_STAT ,1 ,BD96801_BUCK_OVD_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_UVD_STAT ,1 ,BD96801_BUCK_UVD_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK1_TW_CH_STAT ,1 ,BD96801_BUCK_TW_CH_STAT_MASK ), +/* BUCK 2 INTB */ +REGMAP_IRQ_REG (BD96802_BUCK2_OCPH_STAT ,2 ,BD96801_BUCK_OCPH_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_OCPL_STAT ,2 ,BD96801_BUCK_OCPL_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_OCPN_STAT ,2 ,BD96801_BUCK_OCPN_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_OVD_STAT ,2 ,BD96801_BUCK_OVD_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_UVD_STAT ,2 ,BD96801_BUCK_UVD_STAT_MASK ), +REGMAP_IRQ_REG (BD96802_BUCK2_TW_CH_STAT ,2 ,BD96801_BUCK_TW_CH_STAT_MASK ), +}; + +/* +* The IRQ stuff is a bit hairy. The BD96801 / BD96802 provide two physical +* IRQ lines called INTB and ERRB. They share the same main status register. +* +* For ERRB, mapping from main status to sub-status is such that the +* 'global' faults are mapped to first 3 sub-status registers - and indicated +* by the first bit[0] in main status reg. +* +* Rest of the status registers are for indicating stuff for individual +* regulators, 1 sub register / regulator and 1 main status register bit / +* regulator, starting from bit[1]. +* +* Eg, regulator specific stuff has 1 to 1 mapping from main-status to sub +* registers but 'global' ERRB IRQs require mapping from main status bit[0] to +* 3 status registers. +* +* Furthermore, the BD96801 has 7 regulators where the BD96802 has only 2. +* +* INTB has only 1 sub status register for 'global' events and then own sub +* status register for each of the regulators. So, for INTB we have direct +* 1 to 1 mapping - BD96801 just having 5 register and 5 main status bits +* more than the BD96802. +* +* Sharing the main status bits could be a problem if we had both INTB and +* ERRB IRQs asserted but for different sub-status offsets. This might lead +* IRQ controller code to go read a sub status register which indicates no +* active IRQs. I assume this occurring repeteadly might lead the IRQ to be +* disabled by core as a result of repeteadly returned IRQ_NONEs. +* +* I don't consider this as a fatal problem for now because: +* a) Having ERRB asserted leads to PMIC fault state which will kill +* the SoC powered by the PMIC. (So, relevant only for potential +* case of not powering the processor with this PMIC). +* b) Having ERRB set without having respective INTB is unlikely +* (haven't actually verified this). +* +* So, let's proceed with main status enabled for both INTB and ERRB. We can +* later disable main-status usage on systems where this ever proves to be +* a problem. +*/ +static const struct regmap_irq_chip bd96801_irq_chip_errb = { .name ="bd96801-irq-errb" , .domain_suffix ="errb" ,
@@ -335,7 +508,23 @@ static const struct regmap_irq_chip bd96801_irq_chip_errb = { .init_ack_masked = true, .num_regs = 10, .irq_reg_stride = 1, - .sub_reg_offsets = &errb_sub_irq_offsets[0], + .sub_reg_offsets = &bd96801_errb_sub_irq_offsets[0], +}; + +static const struct regmap_irq_chip bd96802_irq_chip_errb = { + .name ="bd96802-irq-errb" , + .domain_suffix ="errb" , + .main_status =BD96801_REG_INT_MAIN , + .num_main_regs =1 , + .irqs = &bd96802_errb_irqs[0 ], + .num_irqs =ARRAY_SIZE (bd96802_errb_irqs), + .status_base =BD96801_REG_INT_SYS_ERRB1 , + .mask_base =BD96801_REG_MASK_SYS_ERRB , + .ack_base =BD96801_REG_INT_SYS_ERRB1 , + .init_ack_masked = true, + .num_regs =5 , + .irq_reg_stride =1 , + .sub_reg_offsets = &bd96802_errb_sub_irq_offsets[0 ], };static const struct regmap_irq_chip bd96801_irq_chip_intb = {
@@ -353,10 +542,32 @@ static const struct regmap_irq_chip bd96801_irq_chip_intb = { .irq_reg_stride = 1, }; +static const struct regmap_irq_chip bd96802_irq_chip_intb = { + .name ="bd96802-irq-intb" , + .domain_suffix ="intb" , + .main_status =BD96801_REG_INT_MAIN , + .num_main_regs =1 , + .irqs = &bd96802_intb_irqs[0 ], + .num_irqs =ARRAY_SIZE (bd96802_intb_irqs), + .status_base =BD96801_REG_INT_SYS_INTB , + .mask_base =BD96801_REG_MASK_SYS_INTB , + .ack_base =BD96801_REG_INT_SYS_INTB , + .init_ack_masked = true, + .num_regs =3 , + .irq_reg_stride =1 , +}; +static const struct regmap_config bd96801_regmap_config = { .reg_bits =8 , .val_bits =8 , - .volatile_table = &volatile_regs, + .volatile_table = &bd96801_volatile_regs, + .cache_type =REGCACHE_MAPLE , +}; + +static const struct regmap_config bd96802_regmap_config = { + .reg_bits =8 , + .val_bits =8 , + .volatile_table = &bd96802_volatile_regs, .cache_type =REGCACHE_MAPLE , };
@@ -374,6 +585,20 @@ static const struct bd968xx_chip_data bd96801_chip_data = { .unlock_val = BD96801_UNLOCK, }; +static struct bd968xx_chip_data bd96802_chip_data = { + .errb_irqs = bd96802_reg_errb_irqs, + .intb_irqs = bd96802_reg_intb_irqs, + .num_errb_irqs =ARRAY_SIZE (bd96802_reg_errb_irqs), + .num_intb_irqs =ARRAY_SIZE (bd96802_reg_intb_irqs), + .errb_irq_chip = &bd96802_irq_chip_errb, + .intb_irq_chip = &bd96802_irq_chip_intb, + .regmap_config = &bd96802_regmap_config, + .cells = bd96802_cells, + .num_cells =ARRAY_SIZE (bd96802_cells), + .unlock_reg =BD96801_LOCK_REG , + .unlock_val =BD96801_UNLOCK , +}; +static int bd96801_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *intb_irq_data, *errb_irq_data;
@@ -388,8 +613,10 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)int i, ret; cd =device_get_match_data (&i2c->dev); -if (!cd) +if (!cd) { +dev_err (&i2c->dev,"No data\n" );return -ENODEV ; + } fwnode =dev_fwnode (&i2c->dev);if (!fwnode)
@@ -481,6 +708,7 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)static const struct of_device_id bd96801_of_match[] = { { .compatible ="rohm,bd96801" , .data = &bd96801_chip_data, }, + { .compatible ="rohm,bd96802" , .data = &bd96802_chip_data, }, { } };MODULE_DEVICE_TABLE (of, bd96801_of_match);
include/linux/mfd/rohm-bd96801.h +2 -0
@@ -40,7 +40,9 @@* INTB status registers are at range 0x5c ... 0x63 */ #define BD96801_REG_INT_SYS_ERRB1 0x52 +#define BD96801_REG_INT_BUCK2_ERRB 0x56#define BD96801_REG_INT_SYS_INTB 0x5c +#define BD96801_REG_INT_BUCK2_INTB 0x5e#define BD96801_REG_INT_LDO7_INTB 0x63/* MASK registers */
include/linux/mfd/rohm-bd96802.h new file +74 -0
74 lines not on this page · raw message
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 9/14 regulator: bd96801: Support ROHM BD96802
In reply to Matti VaittinenThe ROHM BD96802 PMIC is primarily intended to be used as a companion PMIC extending the capabilities of the BD96802 but it can be used on it's own as well. When used as a companion PMIC, the start-up and shut-down sequences are usually intitiated by the master PMIC using IF pins.
The BD96802 looks from the digital interface point of view pretty much like a reduced version of BD96801. It includes only 2 BUCKs and provides the same error protection/detection mechanisms as the BD96801. Also, the voltage control logic is same up to the register addresses.
Add support for controlling BD96802 using the BD96801 driver.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/regulator/bd96801-regulator.c | 92 ++++++++++++++++++++++++--- 1 file changed, 83 insertions(+), 9 deletions(-)
drivers/regulator/bd96801-regulator.c +83 -9
@@ -302,6 +302,7 @@ struct bd96801_pmic_data {struct bd96801_regulator_data regulator_data[BD96801_NUM_REGULATORS ];struct regmap *regmap;int fatal_ind; +int num_regulators; }; static int ldo_map_notif(int irq, struct regulator_irq_data *rid,
@@ -503,6 +504,70 @@ static int bd96801_walk_regulator_dt(struct device *dev, struct regmap *regmap,* case later. What we can easly do for preparing is to not use static global * data for regulators though. */ +static const struct bd96801_pmic_data bd96802_data = { + .regulator_data = { + { + .desc = { + .name ="buck1" , + .of_match =of_match_ptr ("buck1" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK1 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96801_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96801_tune_volts), + .n_voltages =BD96801_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK1_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK1_VSEL_REG , + .vsel_mask =BD96801_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK1_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .init_ranges = bd96801_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96801_buck_init_volts), + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck1_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck1_irqinfo), + }, + }, + { + .desc = { + .name ="buck2" , + .of_match =of_match_ptr ("buck2" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK2 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96801_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96801_tune_volts), + .n_voltages =BD96801_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK2_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK2_VSEL_REG , + .vsel_mask =BD96801_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK2_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck2_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck2_irqinfo), + }, + .init_ranges = bd96801_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96801_buck_init_volts), + }, + }, + .num_regulators =2 , +}; +static const struct bd96801_pmic_data bd96801_data = { .regulator_data = { {
@@ -688,11 +753,13 @@ static const struct bd96801_pmic_data bd96801_data = { .ldo_vol_lvl = BD96801_LDO7_VOL_LVL_REG, }, }, + .num_regulators = 7, }; -static int initialize_pmic_data (struct device *dev, +static int initialize_pmic_data (struct platform_device *pdev,struct bd96801_pmic_data *pdata) { +struct device *dev = &pdev->dev;int r, i;/*
@@ -700,7 +767,7 @@ static int initialize_pmic_data(struct device *dev,* wish to modify IRQ information independently for each driver * instance. */ -for (r =0 ; r <BD96801_NUM_REGULATORS ; r++) { +for (r =0 ; r < pdata->num_regulators; r++) {const struct bd96801_irqinfo *template;struct bd96801_irqinfo *new;int num_infos;
@@ -866,6 +933,7 @@ static int bd96801_probe(struct platform_device *pdev) {struct regulator_dev *ldo_errs_rdev_arr[BD96801_NUM_LDOS ];struct regulator_dev *all_rdevs[BD96801_NUM_REGULATORS ]; +struct bd96801_pmic_data *pdata_template;struct bd96801_regulator_data *rdesc;struct regulator_config config = {};int ldo_errs_arr[BD96801_NUM_LDOS ];
@@ -878,12 +946,16 @@ static int bd96801_probe(struct platform_device *pdev) parent = pdev->dev.parent; - pdata =devm_kmemdup (&pdev->dev, &bd96801_data,sizeof (bd96801_data), + pdata_template = (struct bd96801_pmic_data *)platform_get_device_id (pdev)->driver_data; +if (!pdata_template) +return -ENODEV ; + + pdata =devm_kmemdup (&pdev->dev, pdata_template,sizeof (bd96801_data),GFP_KERNEL );if (!pdata)return -ENOMEM ; -if (initialize_pmic_data (&pdev->dev, pdata)) +if (initialize_pmic_data (pdev, pdata))return -ENOMEM ; pdata->regmap =dev_get_regmap (parent,NULL );
@@ -906,11 +978,11 @@ static int bd96801_probe(struct platform_device *pdev) use_errb = true; ret =bd96801_walk_regulator_dt (&pdev->dev, pdata->regmap, rdesc, -BD96801_NUM_REGULATORS ); + pdata->num_regulators);if (ret)return ret; -for (i =0 ; i <ARRAY_SIZE (pdata->regulator_data); i++) { +for (i =0 ; i < pdata->num_regulators; i++) {struct regulator_dev *rdev;struct bd96801_irq_desc *idesc = &rdesc[i].irq_desc;int j;
@@ -923,6 +995,7 @@ static int bd96801_probe(struct platform_device *pdev) rdesc[i].desc.name);return PTR_ERR (rdev); } + all_rdevs[i] = rdev;/* * LDOs don't have own temperature monitoring. If temperature
@@ -972,14 +1045,15 @@ static int bd96801_probe(struct platform_device *pdev)if (use_errb)return bd96801_global_errb_irqs (pdev, all_rdevs, -ARRAY_SIZE (all_rdevs)); + pdata->num_regulators);return 0 ; }static const struct platform_device_id bd96801_pmic_id[] = { - {"bd96801-regulator" , }, - { } + {"bd96801-regulator" , (kernel_ulong_t)&bd96801_data }, + {"bd96802-regulator" , (kernel_ulong_t)&bd96802_data }, + { }, };MODULE_DEVICE_TABLE (platform, bd96801_pmic_id);
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 10/14 mfd: bd96801: Support ROHM BD96805
In reply to Matti VaittinenThe ROHM BD96805 is from the software perspective almost identical to the ROHM BD96801. The main difference is different voltage tuning ranges. Add support differentiating these PMICs based on the compatible, and invoking the regulator driver with correct IC type.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/mfd/rohm-bd96801.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/mfd/rohm-bd96801.c +19 -0
@@ -220,6 +220,10 @@ static struct mfd_cell bd96802_cells[] = { [WDG_CELL] = { .name = "bd96801-wdt", }, [REGULATOR_CELL] = { .name = "bd96802-regulator", }, }; +static struct mfd_cell bd96805_cells[] = { + [WDG_CELL ] = { .name ="bd96801-wdt" , }, + [REGULATOR_CELL ] = { .name ="bd96805-regulator" , }, +};static const struct regmap_range bd96801_volatile_ranges[] = {/* Status registers */
@@ -599,6 +603,20 @@ static struct bd968xx_chip_data bd96802_chip_data = { .unlock_val = BD96801_UNLOCK, }; +static const struct bd968xx_chip_data bd96805_chip_data = { + .errb_irqs = bd96801_reg_errb_irqs, + .intb_irqs = bd96801_reg_intb_irqs, + .num_errb_irqs =ARRAY_SIZE (bd96801_reg_errb_irqs), + .num_intb_irqs =ARRAY_SIZE (bd96801_reg_intb_irqs), + .errb_irq_chip = &bd96801_irq_chip_errb, + .intb_irq_chip = &bd96801_irq_chip_intb, + .regmap_config = &bd96801_regmap_config, + .cells = bd96805_cells, + .num_cells =ARRAY_SIZE (bd96805_cells), + .unlock_reg =BD96801_LOCK_REG , + .unlock_val =BD96801_UNLOCK , +}; +static int bd96801_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *intb_irq_data, *errb_irq_data;
@@ -709,6 +727,7 @@ static int bd96801_i2c_probe(struct i2c_client *i2c)static const struct of_device_id bd96801_of_match[] = { { .compatible ="rohm,bd96801" , .data = &bd96801_chip_data, }, { .compatible ="rohm,bd96802" , .data = &bd96802_chip_data, }, + { .compatible ="rohm,bd96805" , .data = &bd96805_chip_data, }, { } };MODULE_DEVICE_TABLE (of, bd96801_of_match);
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 11/14 regulator: bd96801: Support ROHM BD96805 PMIC
In reply to Matti VaittinenThe ROHM BD96805 is from the software perspective almost identical to the ROHM BD96801. The main difference is different voltage tuning ranges.
Add support differentiating these PMICs and provide correct voltages for both models.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/regulator/bd96801-regulator.c | 207 ++++++++++++++++++++++++++ 1 file changed, 207 insertions(+)
drivers/regulator/bd96801-regulator.c +207 -0
@@ -83,6 +83,7 @@ enum {#define BD96801_LDO6_VSEL_REG 0x26#define BD96801_LDO7_VSEL_REG 0x27#define BD96801_BUCK_VSEL_MASK 0x1F +#define BD96805_BUCK_VSEL_MASK 0x3f#define BD96801_LDO_VSEL_MASK 0xff#define BD96801_MASK_RAMP_DELAY 0xc0
@@ -90,6 +91,7 @@ enum {#define BD96801_BUCK_INT_VOUT_MASK 0xff#define BD96801_BUCK_VOLTS 256 +#define BD96805_BUCK_VOLTS 64#define BD96801_LDO_VOLTS 256#define BD96801_OVP_MASK 0x03
@@ -160,6 +162,22 @@ static const struct linear_range bd96801_buck_init_volts[] = { REGULATOR_LINEAR_RANGE(3300000 - 150000, 0xed, 0xff, 0), }; +/* +* On BD96805 we have similar "negative tuning range" as on BD96801, except +* that the max tuning is -310 ... +310 mV (instead of the 150mV). We use same +* approach as with the BD96801 ranges. +*/ +static const struct linear_range bd96805_tune_volts[] = { +REGULATOR_LINEAR_RANGE (310000 ,0x00 ,0x1F ,10000 ), +REGULATOR_LINEAR_RANGE (0 ,0x20 ,0x3F ,10000 ), +}; + +static const struct linear_range bd96805_buck_init_volts[] = { +REGULATOR_LINEAR_RANGE (500000 -310000 ,0x00 ,0xc8 ,5000 ), +REGULATOR_LINEAR_RANGE (1550000 -310000 ,0xc9 ,0xec ,50000 ), +REGULATOR_LINEAR_RANGE (3300000 -310000 ,0xed ,0xff ,0 ), +}; +static const struct linear_range bd96801_ldo_int_volts[] = {REGULATOR_LINEAR_RANGE (300000 ,0x00 ,0x78 ,25000 ),REGULATOR_LINEAR_RANGE (3300000 ,0x79 ,0xff ,0 ),
@@ -756,6 +774,194 @@ static const struct bd96801_pmic_data bd96801_data = { .num_regulators = 7, }; +static const struct bd96801_pmic_data bd96805_data = { + .regulator_data = { + { + .desc = { + .name ="buck1" , + .of_match =of_match_ptr ("buck1" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK1 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK1_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK1_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK1_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .init_ranges = bd96805_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96805_buck_init_volts), + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck1_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck1_irqinfo), + }, + }, { + .desc = { + .name ="buck2" , + .of_match =of_match_ptr ("buck2" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK2 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK2_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK2_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK2_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck2_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck2_irqinfo), + }, + .init_ranges = bd96805_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96805_buck_init_volts), + }, { + .desc = { + .name ="buck3" , + .of_match =of_match_ptr ("buck3" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK3 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK3_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK3_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK3_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck3_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck3_irqinfo), + }, + .init_ranges = bd96805_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96805_buck_init_volts), + }, { + .desc = { + .name ="buck4" , + .of_match =of_match_ptr ("buck4" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK4 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK4_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK4_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK4_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck4_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck4_irqinfo), + }, + .init_ranges = bd96805_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96805_buck_init_volts), + }, { + .desc = { + .name ="ldo5" , + .of_match =of_match_ptr ("ldo5" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_LDO5 , + .ops = &bd96801_ldo_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96801_ldo_int_volts, + .n_linear_ranges =ARRAY_SIZE (bd96801_ldo_int_volts), + .n_voltages =BD96801_LDO_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_LDO5_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_LDO5_VSEL_REG , + .vsel_mask =BD96801_LDO_VSEL_MASK , + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&ldo5_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (ldo5_irqinfo), + }, + .ldo_vol_lvl =BD96801_LDO5_VOL_LVL_REG , + }, { + .desc = { + .name ="ldo6" , + .of_match =of_match_ptr ("ldo6" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_LDO6 , + .ops = &bd96801_ldo_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96801_ldo_int_volts, + .n_linear_ranges =ARRAY_SIZE (bd96801_ldo_int_volts), + .n_voltages =BD96801_LDO_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_LDO6_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_LDO6_VSEL_REG , + .vsel_mask =BD96801_LDO_VSEL_MASK , + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&ldo6_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (ldo6_irqinfo), + }, + .ldo_vol_lvl =BD96801_LDO6_VOL_LVL_REG , + }, { + .desc = { + .name ="ldo7" , + .of_match =of_match_ptr ("ldo7" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_LDO7 , + .ops = &bd96801_ldo_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96801_ldo_int_volts, + .n_linear_ranges =ARRAY_SIZE (bd96801_ldo_int_volts), + .n_voltages =BD96801_LDO_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_LDO7_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_LDO7_VSEL_REG , + .vsel_mask =BD96801_LDO_VSEL_MASK , + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&ldo7_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (ldo7_irqinfo), + }, + .ldo_vol_lvl =BD96801_LDO7_VOL_LVL_REG , + }, + }, + .num_regulators =7 , +}; +static int initialize_pmic_data (struct platform_device *pdev,struct bd96801_pmic_data *pdata) {
@@ -1053,6 +1259,7 @@ static int bd96801_probe(struct platform_device *pdev)static const struct platform_device_id bd96801_pmic_id[] = { {"bd96801-regulator" , (kernel_ulong_t)&bd96801_data }, {"bd96802-regulator" , (kernel_ulong_t)&bd96802_data }, + {"bd96805-regulator" , (kernel_ulong_t)&bd96805_data }, { }, };MODULE_DEVICE_TABLE (platform, bd96801_pmic_id);
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 12/14 mfd: bd96801: Support ROHM BD96806
In reply to Matti VaittinenThe ROHM BD96806 is from the software perspective almost identical to the ROHM BD96802. The main difference is different voltage tuning ranges. Add support differentiating these PMICs based on the compatible, and invoking the regulator driver with correct IC type.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/mfd/rohm-bd96801.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/mfd/rohm-bd96801.c +20 -0
@@ -225,6 +225,11 @@ static struct mfd_cell bd96805_cells[] = { [REGULATOR_CELL] = { .name = "bd96805-regulator", }, }; +static struct mfd_cell bd96806_cells[] = { + [WDG_CELL ] = { .name ="bd96806-wdt" , }, + [REGULATOR_CELL ] = { .name ="bd96806-regulator" , }, +}; +static const struct regmap_range bd96801_volatile_ranges[] = {/* Status registers */ regmap_reg_range (BD96801_REG_WD_FEED ,BD96801_REG_WD_FAILCOUNT ),
@@ -617,6 +622,20 @@ static const struct bd968xx_chip_data bd96805_chip_data = { .unlock_val = BD96801_UNLOCK, }; +static struct bd968xx_chip_data bd96806_chip_data = { + .errb_irqs = bd96802_reg_errb_irqs, + .intb_irqs = bd96802_reg_intb_irqs, + .num_errb_irqs =ARRAY_SIZE (bd96802_reg_errb_irqs), + .num_intb_irqs =ARRAY_SIZE (bd96802_reg_intb_irqs), + .errb_irq_chip = &bd96802_irq_chip_errb, + .intb_irq_chip = &bd96802_irq_chip_intb, + .regmap_config = &bd96802_regmap_config, + .cells = bd96806_cells, + .num_cells =ARRAY_SIZE (bd96806_cells), + .unlock_reg =BD96801_LOCK_REG , + .unlock_val =BD96801_UNLOCK , +}; +static int bd96801_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *intb_irq_data, *errb_irq_data;
@@ -728,6 +747,7 @@ static const struct of_device_id bd96801_of_match[] = { { .compatible = "rohm,bd96801", .data = &bd96801_chip_data, }, { .compatible = "rohm,bd96802", .data = &bd96802_chip_data, }, { .compatible = "rohm,bd96805", .data = &bd96805_chip_data, }, + { .compatible = "rohm,bd96806", .data = &bd96806_chip_data, }, { } }; MODULE_DEVICE_TABLE(of, bd96801_of_match);
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 13/14 regulator: bd96801: Support ROHM BD96806 PMIC
In reply to Matti VaittinenThe ROHM BD96806 is from the software perspective almost identical to the ROHM BD96802. The main difference is different voltage tuning ranges.
Add support differentiating these PMICs and provide correct voltages for both models.
Signed-off-by Matti Vaittinen <[email protected]>
--- drivers/regulator/bd96801-regulator.c | 65 +++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
drivers/regulator/bd96801-regulator.c +65 -0
@@ -962,6 +962,70 @@ static const struct bd96801_pmic_data bd96805_data = { .num_regulators = 7, }; +static const struct bd96801_pmic_data bd96806_data = { + .regulator_data = { + { + .desc = { + .name ="buck1" , + .of_match =of_match_ptr ("buck1" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK1 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK1_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK1_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK1_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .init_ranges = bd96801_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96801_buck_init_volts), + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck1_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck1_irqinfo), + }, + }, + { + .desc = { + .name ="buck2" , + .of_match =of_match_ptr ("buck2" ), + .regulators_node =of_match_ptr ("regulators" ), + .id =BD96801_BUCK2 , + .ops = &bd96801_buck_ops, + .type =REGULATOR_VOLTAGE , + .linear_ranges = bd96805_tune_volts, + .n_linear_ranges =ARRAY_SIZE (bd96805_tune_volts), + .n_voltages =BD96805_BUCK_VOLTS , + .enable_reg =BD96801_REG_ENABLE , + .enable_mask =BD96801_BUCK2_EN_MASK , + .enable_is_inverted = true, + .vsel_reg =BD96801_BUCK2_VSEL_REG , + .vsel_mask =BD96805_BUCK_VSEL_MASK , + .ramp_reg =BD96801_BUCK2_VSEL_REG , + .ramp_mask =BD96801_MASK_RAMP_DELAY , + .ramp_delay_table = &buck_ramp_table[0 ], + .n_ramp_values =ARRAY_SIZE (buck_ramp_table), + .owner =THIS_MODULE , + }, + .irq_desc = { + .irqinfo = (struct bd96801_irqinfo *)&buck2_irqinfo[0 ], + .num_irqs =ARRAY_SIZE (buck2_irqinfo), + }, + .init_ranges = bd96801_buck_init_volts, + .num_ranges =ARRAY_SIZE (bd96801_buck_init_volts), + }, + }, + .num_regulators =2 , +}; +static int initialize_pmic_data (struct platform_device *pdev,struct bd96801_pmic_data *pdata) {
@@ -1260,6 +1324,7 @@ static const struct platform_device_id bd96801_pmic_id[] = { { "bd96801-regulator", (kernel_ulong_t)&bd96801_data }, { "bd96802-regulator", (kernel_ulong_t)&bd96802_data }, { "bd96805-regulator", (kernel_ulong_t)&bd96805_data }, + { "bd96806-regulator", (kernel_ulong_t)&bd96806_data }, { }, };MODULE_DEVICE_TABLE (platform, bd96801_pmic_id);
Signature · 1 line
2.48.1
Matti Vaittinen
maintainerPATCH 14/14 MAINTAINERS: Add BD96802 specific header
In reply to Matti VaittinenAdd the include/linux/mfd/rohm-bd96802.h to the list of the ROHM PMIC specific files maintained by the undersigned.
Signed-off-by Matti Vaittinen <[email protected]>
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -20599,6 +20599,7 @@ F: include/linux/mfd/rohm-bd71828.h F: include/linux/mfd/rohm-bd718x7.h F: include/linux/mfd/rohm-bd957x.h F: include/linux/mfd/rohm-bd96801.h +F: include/linux/mfd/rohm-bd96802.h F: include/linux/mfd/rohm-generic.h F: include/linux/mfd/rohm-shared.h
Signature · 1 line
2.48.1