Support ROHM BD72720 PMIC
Subsystems (10)
v5 cover Support ROHM BD72720 PMIC
The ROHM BD72720 is a new power management IC for portable, battery powered devices. It integrates 10 BUCKs and 11 LDOs, RTC, charger, LEDs, GPIOs and a clock gate. To me the BD72720 seems like a successor to the BD71828 and BD71815 PMICs.
This series depends on5bff79dad20a ("power: supply: Add bd718(15/28/78) charger driver") which is in power-supply tree, for-next. Thus, the series is based on it.
The testing of v4 suffered some hardware-issues after I accidentally enabled charging while the PMIC's battery pin was connected to the I/O domain. Some heat was generated, not terribly lot smoke though...
After the incident I've had occasional I2C failures. I, however, suspect the root cause is HW damage in I/O lines since changes in this revision have been made to dt-bindings. It's still fair to note that though, as my testing was impacted.
Revision history:
v4 => v5:
- dt-binding fixes as discussed in v4 reviews.
- Drop rohm,vdr-battery.yaml and add vdr properties to battery.yaml
- Drop 'rohm,' -vendor-prefix from vdr properties
- Link to v4:
https://lore.kernel.org/all/[email protected]/
More accurate changelog in individual patches
v3 => v4:
- dt-binding fixes to the BD72720 MFD example and regulator bindings More accurate changelog in individual patches
v2 => v3:
- rebased to power-supply/for-next as dependencies are merged to there
- plenty of dt-binding changes as suggested by reviewers
- add new patch to better document existing 'trickle-charging' property More accurate changelog in individual patches
RFCv1 => v2:
- Drop RFC status
- Use stacked regmaps to hide secondary map from the sub-drivers
- Quite a few styling fixes and improvements as suggested by reviewers. More accurate changelog in individual patches.
- Link to v1:
https://lore.kernel.org/all/[email protected]/
---
Matti Vaittinen (16):
dt-bindings: regulator: ROHM BD72720
dt-bindings: battery: Clarify trickle-charge
dt-bindings: battery: Add trickle-charge upper limit
dt-bindings: battery: Voltage drop properties
dt-bindings: mfd: ROHM BD72720
dt-bindings: leds: bd72720: Add BD72720
mfd: rohm-bd71828: Use regmap_reg_range()
mfd: bd71828: Support ROHM BD72720
regulator: bd71828: rename IC specific entities
regulator: bd71828: Support ROHM BD72720
gpio: Support ROHM BD72720 gpios
clk: clk-bd718x7: Support BD72720 clk gate
rtc: bd70528: Support BD72720 rtc
power: supply: bd71828: Support wider register addresses
power: supply: bd71828-power: Support ROHM BD72720
MAINTAINERS: Add ROHM BD72720 PMIC
.../bindings/leds/rohm,bd71828-leds.yaml | 7 +- .../bindings/mfd/rohm,bd72720-pmic.yaml | 339 ++++++ .../bindings/power/supply/battery.yaml | 33 +- .../regulator/rohm,bd72720-regulator.yaml | 148 +++ MAINTAINERS | 2 + drivers/clk/Kconfig | 4 +- drivers/clk/clk-bd718x7.c | 10 +- drivers/gpio/Kconfig | 9 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-bd72720.c | 281 +++++ drivers/mfd/Kconfig | 18 +- drivers/mfd/rohm-bd71828.c | 546 ++++++++- drivers/power/supply/bd71828-power.c | 160 ++- drivers/regulator/Kconfig | 8 +- drivers/regulator/bd71828-regulator.c | 1025 ++++++++++++++++- drivers/rtc/Kconfig | 3 +- drivers/rtc/rtc-bd70528.c | 21 +- include/linux/mfd/rohm-bd72720.h | 634 ++++++++++ include/linux/mfd/rohm-generic.h | 1 + 19 files changed, 3120 insertions(+), 130 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml create mode 100644 drivers/gpio/gpio-bd72720.c create mode 100644 include/linux/mfd/rohm-bd72720.h
base-commit: 8e8856396b54bea5c00a7ae88d87c6254aef2d94
Signature · 1 line
2.51.1
PATCH v5 1/16 dt-bindings: regulator: ROHM BD72720
From: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a new PMIC with 10 BUCk and 11 LDO regulators.
The BD72720 is designed to support using the BUCK10 as a supply for the LDOs 1 to 4. When the BUCK10 is used for this, it can be set to a LDON_HEAD mode. In this mode, the BUCK10 voltage can't be controlled by software, but the voltage is adjusted by PMIC to match the LDO1 .. LDO4 voltages with a given offset. Offset can be 50mV .. 300mV and is changeable at 50mV steps.
Add 'ldon-head-microvolt' property to denote a board which is designed to utilize the LDON_HEAD mode.
All other properties are already existing.
Add dt-binding doc for ROHM BD72720 regulators to make it usable.
---
Revision history:
v4 =>
- No changes
v3 => v4:
- Drop type from ldon-head
- Fix the name patterns for regulator nodes and names
v2 => v3:
- drop unnecessary descriptions
- use microvolts for the 'ldon-head' dt-property
RFCv1 => v2:
- No changes
--- .../regulator/rohm,bd72720-regulator.yaml | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml
Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml new file +148 -0
@@ -0,0 +1,148 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/rohm,bd72720-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD72720 Power Management Integrated Circuit regulators + +maintainers: + - Matti Vaittinen <[email protected]> + +description: | + This module is part of the ROHM BD72720 MFD device. For more details + see Documentation/devicetree/bindings/mfd/rohm,bd72720-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 BUCK_<number> and LDO_<number>. + The valid names for BD72720 regulator nodes are + buck1, buck2, buck3, buck4, buck5, buck6, buck7, buck8, buck9, buck10 + ldo1, ldo2, ldo3, ldo4, ldo5, ldo6, ldo7, ldo8, ldo9, ldo10, ldo11 + +patternProperties: + "^ldo([1-9]|1[0-1])$": + type: object + description: + Properties for single LDO regulator. + $ref: regulator.yaml# + + properties: + regulator-name: + pattern: "^ldo([1-9]|1[0-1])$" + + rohm,dvs-run-voltage: + description: + PMIC default "RUN" state voltage in uV. See below table for + LDOs which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-idle-voltage: + description: + PMIC default "IDLE" state voltage in uV. See below table for + LDOs which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-suspend-voltage: + description: + PMIC default "SUSPEND" state voltage in uV. See below table for + LDOs which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-lpsr-voltage: + description: + PMIC default "deep-idle" state voltage in uV. See below table for + LDOs which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + # Supported default DVS states: + # ldo | run | idle | suspend | lpsr + # -------------------------------------------------------------- + # 1, 2, 3, and 4 | supported | supported | supported | supported + # -------------------------------------------------------------- + # 5 - 11 | supported (*) + # -------------------------------------------------------------- + # + # (*) All states use same voltage but have own enable / disable + # settings. Voltage 0 can be specified for a state to make + # regulator disabled on that state. + + unevaluatedProperties: false + + "^buck([1-9]|10)$": + type: object + description: + Properties for single BUCK regulator. + $ref: regulator.yaml# + + properties: + regulator-name: + pattern: "^buck([1-9]|10)$" + + rohm,ldon-head-microvolt: + description: + Set this on boards where BUCK10 is used to supply LDOs 1-4. The bucki + voltage will be changed by the PMIC to follow the LDO output voltages + with the offset voltage given here. This will improve the LDO efficiency. + minimum: 50000 + maximum: 300000 + + rohm,dvs-run-voltage: + description: + PMIC default "RUN" state voltage in uV. See below table for + bucks which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-idle-voltage: + description: + PMIC default "IDLE" state voltage in uV. See below table for + bucks which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-suspend-voltage: + description: + PMIC default "SUSPEND" state voltage in uV. See below table for + bucks which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + rohm,dvs-lpsr-voltage: + description: + PMIC default "deep-idle" state voltage in uV. See below table for + bucks which support this. 0 means disabled. + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3300000 + + # Supported default DVS states: + # buck | run | idle | suspend | lpsr + # -------------------------------------------------------------- + # 1, 2, 3, and 4 | supported | supported | supported | supported + # -------------------------------------------------------------- + # 5 - 10 | supported (*) + # -------------------------------------------------------------- + # + # (*) All states use same voltage but have own enable / disable + # settings. Voltage 0 can be specified for a state to make + # regulator disabled on that state. + + required: + - regulator-name + + unevaluatedProperties: false + +additionalProperties: false
Signature · 1 line
2.51.1
Rob Herring (Arm)
maintainerRe: [PATCH v5 01/16] dt-bindings: regulator: ROHM BD72720
Quoted 34 lines · Matti Vaittinen
From: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a new PMIC with 10 BUCk and 11 LDO regulators.
The BD72720 is designed to support using the BUCK10 as a supply for the LDOs 1 to 4. When the BUCK10 is used for this, it can be set to a
LDON_HEADmode. In this mode, the BUCK10 voltage can't be controlled by software, but the voltage is adjusted by PMIC to match the LDO1 .. LDO4 voltages with a given offset. Offset can be 50mV .. 300mV and is changeable at 50mV steps.Add 'ldon-head-microvolt' property to denote a board which is designed to utilize the
LDON_HEADmode.All other properties are already existing.
Add dt-binding doc for ROHM BD72720 regulators to make it usable.
Signed-off-by Matti Vaittinen <[email protected]>Reviewed-by Rob Herring (Arm) <[email protected]>---
Revision history:
v4 =>
- No changesv3 => v4:
- Drop type from ldon-head
- Fix the name patterns for regulator nodes and namesv2 => v3:
- drop unnecessary descriptions
- use microvolts for the 'ldon-head' dt-property
Quoted 7 lines
RFCv1 => v2:
- No changes--- .../regulator/rohm,bd72720-regulator.yaml | 148 ++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
doc reference errors (make refcheckdocs):
Warning: Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml references a file that doesn't exist: Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml: Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
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 after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
PATCH v5 2/16 dt-bindings: battery: Clarify trickle-charge
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The term 'trickle-charging' is used to describe a very slow charging phase, where electrons "trickle-in" the battery.
There are two different use-cases for this type of charging. At least some Li-Ion batteries can benefit from very slow, constant current, pre-pre phase 'trickle-charging', if a battery is very empty.
Some other batteries use top-off phase 'trickle-charging', which is different from the above case.
The battery bindings use the term 'trickle-charge' without specifying which of the use-cases properties are addressing. This has already caused some confusion.
Clarify that the 'trickle-charge-current-microamp' refers to the first one, the "pre-pre" -charging use-case.
---
Revision history:
v3 => :
- No changes
v2 => v3:
- New patch
--- .../devicetree/bindings/power/supply/battery.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/power/supply/battery.yaml +6 -1
@@ -64,7 +64,12 @@ properties: description: battery design capacity trickle-charge-current-microamp: - description: current for trickle-charge phase + description: current for trickle-charge phase. + Please note that the trickle-charging here, refers "wake-up" or + "pre-pre" -charging, for very empty batteries. Similar term is also + used for "maintenance" or "top-off" -charging of batteries (like + NiMh bq24400) - that is different and not controlled by this + property. precharge-current-microamp: description: current for pre-charge phase
Signature · 1 line
2.51.1
PATCH v5 3/16 dt-bindings: battery: Add trickle-charge upper limit
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
Some of the chargers for lithium-ion batteries use a trickle-charging as a first charging phase for very empty batteries, to "wake-up" the battery. Trickle-charging is a low current, constant current phase. After the voltage of the very empty battery has reached an upper limit for trickle charging, the pre-charge phase is started with a higher current.
Allow defining the upper limit for trickle charging voltage, after which the charging should be changed to the pre-charging.
---
Revision history:
v3 => :
- No changes
v2 => v3:
- Clarify the 'trickle-charging' the property refers to is the "pre-pre" -phase charging.
RFCv1 => v2:
- No changes
--- Documentation/devicetree/bindings/power/supply/battery.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/power/supply/battery.yaml +4 -0
@@ -71,6 +71,10 @@ properties: NiMh bq24400) - that is different and not controlled by this property. + tricklecharge-upper-limit-microvolt: + description: limit when to change to precharge from trickle charge + Trickle-charging here refers "wake-up" or "pre-pre" -charging. + precharge-current-microamp: description: current for pre-charge phase
Signature · 1 line
2.51.1
PATCH v5 4/16 dt-bindings: battery: Voltage drop properties
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
ROHM has developed a so called "zero-correction" -algorithm to improve the fuel-gauging accuracy close to the point where battery is depleted. This relies on battery specific "VDR" (voltage drop rate) tables, which are measured from the battery, and which describe the voltage drop rate. More thorough explanation about the "zero correction" and "VDR" parameters is here:
https://lore.kernel.org/all/[email protected]/
Document the VDR zero-correction specific battery properties used by the BD71815, BD71828, BD72720 and some other ROHM chargers. (Note, charger drivers aren't upstream yet).
---
Revision history:
v4 => v5:
- Move volt-drop parameters from rohm,vdr-battry,yaml to the battery.yaml
- drop rohm, -prefix from volt-drop-* properties
- Drop the rohm,vdr-battry,yaml
- Add comment clarifying what the rohm,volt-drop-* properties are for because this may no longer be obvious as they were moved to common battery.yaml
- Drop Linus Walleij's rb-tag because the concept was changed
v3 => v4:
- No changes
v2 => v3:
- Constrain VDR threshold voltage to 48V
- Use standard '-bp' -suffix for the rohm,volt-drop-soc
RFCv1 => v2:
- Add units to rohm,volt-drop-soc (tenths of %)
- Give real temperatures matching the VDR tables, instead of vague 'high', 'normal', 'low', 'very low'. (Add table of temperatures and use number matching the right temperature index in the VDR table name).
- Fix typoed 'algorithm' in commit message.
The parameters are describing the battery voltage drop rates - so they are properties of the battery, not the charger. Thus they do not belong in the charger node.
The right place for them is the battery node, which is described by the generic "battery.yaml". There were some discussion whether these properties should be in their own file, or if they should be added to battery.yaml. Discussion can be found from:
https://lore.kernel.org/all/[email protected]/
This patch implements the volt-drop properties as generic (not vemdor specific) properties in the battery.yaml. It's worth noting that these properties are:
- Meaningful only for those charger drivers which have the VDR algorithm implemented. (And even though the algorithm is not charger specific, AFAICS, it is currently only used by some ROHM PMIC drivers).
- Technique of measuring the VDR tables for a battery is not widely known. AFAICS, only folks at ROHM are measuring those for some customer products. We do have those tables available for some of the products, like Kobo e-readers though.
--- .../bindings/power/supply/battery.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
Documentation/devicetree/bindings/power/supply/battery.yaml +22 -0
@@ -128,6 +128,21 @@ properties: - description: alert when battery temperature is lower than this value - description: alert when battery temperature is higher than this value + # The volt-drop* -properties describe voltage-drop for a battery, described + # as VDROP in: + # https://patentimages.storage.googleapis.com/6c/f5/17/c1d901c220f6a9/US20150032394A1.pdf + volt-drop-thresh-microvolt: + description: Threshold for starting the VDR correction + maximum: 48000000 + + volt-drop-soc-bp: + description: Table of capacity values matching the values in VDR tables. + The value should be given as basis points, 1/100 of a percent. + + volt-drop-temperatures-millicelsius: + description: An array containing the temperature in milli celsius, for each + of the VDR lookup table. + required: - compatible
@@ -146,6 +161,13 @@ patternProperties: - description: battery capacity percent maximum: 100 + '^volt-drop-[0-9]-microvolt': + description: Table of the voltage drop rate (VDR) values. Each entry in the + table should match a capacity value in the volt-drop-soc table. + Furthermore, the values should be obtained for the temperature given in + volt-drop-temperatures-millicelsius table at index matching the + number in this table's name. + additionalProperties: false examples:
Signature · 1 line
2.51.1
Re: [PATCH v5 04/16] dt-bindings: battery: Voltage drop properties
Quoted 64 lines · Matti Vaittinen
From: Matti Vaittinen <[email protected]>
ROHM has developed a so called "zero-correction" -algorithm to improve the fuel-gauging accuracy close to the point where battery is depleted. This relies on battery specific "VDR" (voltage drop rate) tables, which are measured from the battery, and which describe the voltage drop rate. More thorough explanation about the "zero correction" and "VDR" parameters is here:
https://lore.kernel.org/all/[email protected]/Document the VDR zero-correction specific battery properties used by the BD71815, BD71828, BD72720 and some other ROHM chargers. (Note, charger drivers aren't upstream yet).
Signed-off-by Matti Vaittinen <[email protected]>---
Revision history:
v4 => v5:
- Move volt-drop parameters from rohm,vdr-battry,yaml to thebattery.yaml
- drop rohm, -prefix from volt-drop-* properties
- Drop the rohm,vdr-battry,yaml
- Add comment clarifying what the rohm,volt-drop-* properties are for because this may no longer be obvious as they were moved to commonbattery.yaml
- Drop Linus Walleij's rb-tag because the concept was changedv3 => v4:
- No changesv2 => v3:
- Constrain VDR threshold voltage to 48V
- Use standard '-bp' -suffix for the rohm,volt-drop-socRFCv1 => v2:
- Add units to rohm,volt-drop-soc (tenths of %)
- Give real temperatures matching the VDR tables, instead of vague 'high', 'normal', 'low', 'very low'. (Add table of temperatures and use number matching the right temperature index in the VDR table name).
- Fix typoed 'algorithm' in commit message.The parameters are describing the battery voltage drop rates - so they are properties of the battery, not the charger. Thus they do not belong in the charger node.
The right place for them is the battery node, which is described by the generic "
battery.yaml". There were some discussion whether these properties should be in their own file, or if they should be added tobattery.yaml. Discussion can be found from:
https://lore.kernel.org/all/[email protected]/
This patch implements the volt-drop properties as generic (not vemdor specific) properties in thebattery.yaml. It's worth noting that these properties are:- Meaningful only for those charger drivers which have the VDR algorithm implemented. (And even though the algorithm is not charger specific, AFAICS, it is currently only used by some ROHM PMIC drivers).
- Technique of measuring the VDR tables for a battery is not widely known. AFAICS, only folks at ROHM are measuring those for some customer products. We do have those tables available for some of the products, like Kobo e-readers though.
Quoted 4 lines
--- .../bindings/power/supply/battery.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
PATCH v5 5/16 dt-bindings: mfd: ROHM BD72720
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a power management IC integrating regulators, GPIOs, charger, LEDs, RTC and a clock gate.
Add dt-binding doc for ROHM BD72720.
---
Revision history:
v4 => v5:
- drop rohm, -prefix from vdr parameters
- Link to battery.yaml, not to rohm,vdr-battry.yaml which was removed
v3 => v4:
- Fix typo from the reference to regulator binding
- Fix Rsense limits to micro Ohms
- Fix compatible string in the example
- Fix regulator node names (to lower-case) in the example
- Add the missing regulator nodes to the example
v2 => v3:
- Styling
- Document all pin functions
- use pattern-properties
- re-use existing Rsense binding
- correct the example
RFCv1 => v2:
- Typofixes
--- .../bindings/mfd/rohm,bd72720-pmic.yaml | 339 ++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml
Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml new file +339 -0
@@ -0,0 +1,339 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/rohm,bd72720-pmic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ROHM BD72720 Power Management Integrated Circuit + +maintainers: + - Matti Vaittinen <[email protected]> + +description: + BD72720 is a single-chip power management IC for battery-powered portable + devices. The BD72720 integrates 10 bucks and 11 LDOs, and a 3000 mA + switching charger. The IC also includes a Coulomb counter, a real-time + clock (RTC), GPIOs and a 32.768 kHz clock gate. + +# In addition to the properties found from the charger node, the ROHM BD72720 +# uses properties from a static battery node. Please see the: +# Documentation/devicetree/bindings/power/supply/battery.yaml +# +# Following properties are used +# when present: +# +# charge-full-design-microamp-hours: Battry capacity in mAh +# voltage-max-design-microvolt: Maximum voltage +# voltage-min-design-microvolt: Minimum voltage system is still operating. +# degrade-cycle-microamp-hours: Capacity lost due to aging at each full +# charge cycle. +# ocv-capacity-celsius: Array of OCV table temperatures. 1/table. +# ocv-capacity-table-<N>: Table of OCV voltage/SOC pairs. Corresponds +# N.th temperature in ocv-capacity-celsius +# +# volt-drop-thresh-microvolt: Threshold for starting the VDR correction +# volt-drop-soc: Table of capacity values matching the +# values in VDR tables. +# +# volt-drop-temperatures-millicelsius: Temperatures corresponding to the volage +# drop values given in volt-drop-[0-9]-microvolt +# +# volt-drop-[0-9]-microvolt: VDR table for a temperature specified in +# volt-drop-temperatures-millicelsius +# +# VDR tables are (usually) determined for a specific battery by ROHM. +# The battery node would then be referred from the charger node: +# +# monitored-battery = <&battery>; + +properties: + compatible: + const: rohm,bd72720 + + reg: + description: + I2C slave address. + maxItems: 1 + + interrupts: + maxItems: 1 + + gpio-controller: true + + "#gpio-cells": + const: 2 + description: + The first cell is the pin number and the second cell is used to specify + flags. See the gpio binding document for more information. + + clocks: + maxItems: 1 + + "#clock-cells": + const: 0 + + clock-output-names: + const: bd71828-32k-out + + rohm,clkout-open-drain: + description: clk32kout mode. Set to 1 for "open-drain" or 0 for "cmos". + $ref: /schemas/types.yaml#/definitions/uint32 + maximum: 1 + + rohm,charger-sense-resistor-micro-ohms: + minimum: 10000 + maximum: 50000 + description: + BD72720 has a SAR ADC for measuring charging currents. External sense + resistor (RSENSE in data sheet) should be used. If some other but + 30 mOhm resistor is used the resistance value should be given here in + micro Ohms. + + regulators: + $ref: /schemas/regulator/rohm,bd72720-regulator.yaml + description: + List of child nodes that specify the regulators. + + leds: + $ref: /schemas/leds/rohm,bd71828-leds.yaml + + rohm,pin-fault_b: + $ref: /schemas/types.yaml#/definitions/string + description: + BD72720 has an OTP option to use fault_b-pin for different + purposes. Set this property accordingly. OTP options are + OTP0 - bi-directional FAULT_B or READY indicator depending on a + 'sub option' + OTP1 - GPO + OTP2 - Power sequencer output. + enum: + - faultb + - readyind + - gpo + - pwrseq + +patternProperties: + "^rohm,pin-dvs[0-1]$": + $ref: /schemas/types.yaml#/definitions/string + description: + BD72720 has 4 different OTP options to determine the use of dvs<X>-pins. + OTP0 - regulator RUN state control. + OTP1 - GPI. + OTP2 - GPO. + OTP3 - Power sequencer output. + This property specifies the use of the pin. + enum: + - dvs-input + - gpi + - gpo + - pwrseq + + "^rohm,pin-exten[0-1]$": + $ref: /schemas/types.yaml#/definitions/string + description: BD72720 has an OTP option to use exten0-pin for different + purposes. Set this property accordingly. + OTP0 - GPO + OTP1 - Power sequencer output. + enum: + - gpo + - pwrseq + +required: + - compatible + - reg + - interrupts + - clocks + - "#clock-cells" + - regulators + - gpio-controller + - "#gpio-cells" + +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@4b { + compatible = "rohm,bd72720"; + reg = <0x4b>; + + interrupt-parent = <&gpio1>; + interrupts = <29 IRQ_TYPE_LEVEL_LOW>; + + clocks = <&osc 0>; + #clock-cells = <0>; + clock-output-names = "bd71828-32k-out"; + + gpio-controller; + #gpio-cells = <2>; + + rohm,pin-dvs0 = "gpi"; + rohm,pin-dvs1 = "gpi"; + rohm,pin-exten0 = "gpo"; + rohm,pin-exten1 = "gpo"; + rohm,pin-fault_b = "faultb"; + + rohm,charger-sense-resistor-micro-ohms = <10000>; + + regulators { + buck1 { + regulator-name = "buck1"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <2000000>; + regulator-ramp-delay = <2500>; + }; + buck2 { + regulator-name = "buck2"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <2000000>; + regulator-ramp-delay = <2500>; + }; + buck3 { + regulator-name = "buck3"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <2000000>; + }; + buck4 { + regulator-name = "buck4"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1800000>; + }; + buck5 { + regulator-name = "buck5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <3300000>; + }; + buck6 { + regulator-name = "buck6"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <2000000>; + regulator-ramp-delay = <2500>; + }; + buck7 { + regulator-name = "buck7"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <2000000>; + regulator-ramp-delay = <2500>; + }; + buck8 { + regulator-name = "buck8"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1700000>; + regulator-ramp-delay = <2500>; + rohm,dvs-run-voltage = <1700000>; + rohm,dvs-idle-voltage = <1>; + rohm,dvs-suspend-voltage = <1>; + rohm,dvs-lpsr-voltage = <0>; + regulator-boot-on; + }; + buck9 { + regulator-name = "buck9"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1700000>; + regulator-ramp-delay = <2500>; + rohm,dvs-run-voltage = <1700000>; + rohm,dvs-idle-voltage = <1>; + rohm,dvs-suspend-voltage = <1>; + rohm,dvs-lpsr-voltage = <0>; + regulator-boot-on; + }; + buck10 { + regulator-name = "buck10"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1700000>; + regulator-ramp-delay = <2500>; + rohm,dvs-run-voltage = <1700000>; + rohm,dvs-idle-voltage = <1>; + rohm,dvs-suspend-voltage = <1>; + rohm,dvs-lpsr-voltage = <0>; + regulator-boot-on; + }; + ldo1 { + regulator-name = "ldo1"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo2 { + regulator-name = "ldo2"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo3 { + regulator-name = "ldo3"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo4 { + regulator-name = "ldo4"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo5 { + regulator-name = "ldo5"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo6 { + regulator-name = "ldo6"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + ldo7 { + regulator-name = "ldo7"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + ldo8 { + regulator-name = "ldo8"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3300000>; + rohm,dvs-suspend-voltage = <0>; + rohm,dvs-lpsr-voltage = <1>; + rohm,dvs-run-voltage = <750000>; + }; + ldo9 { + regulator-name = "ldo9"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3300000>; + rohm,dvs-suspend-voltage = <0>; + rohm,dvs-lpsr-voltage = <1>; + rohm,dvs-run-voltage = <750000>; + }; + ldo10 { + regulator-name = "ldo10"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3300000>; + rohm,dvs-suspend-voltage = <0>; + rohm,dvs-lpsr-voltage = <1>; + rohm,dvs-run-voltage = <750000>; + }; + ldo11 { + regulator-name = "ldo11"; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <3300000>; + rohm,dvs-suspend-voltage = <0>; + rohm,dvs-lpsr-voltage = <1>; + rohm,dvs-run-voltage = <750000>; + }; + }; + + leds { + compatible = "rohm,bd71828-leds"; + + led-1 { + rohm,led-compatible = "bd71828-grnled"; + function = LED_FUNCTION_INDICATOR; + color = <LED_COLOR_ID_GREEN>; + }; + led-2 { + rohm,led-compatible = "bd71828-ambled"; + function = LED_FUNCTION_CHARGING; + color = <LED_COLOR_ID_AMBER>; + }; + }; + }; + };
Signature · 1 line
2.51.1
PATCH v5 6/16 dt-bindings: leds: bd72720: Add BD72720
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
Add the ROHM BD72720 documentation to the binding documents.
---
Revision history:
RFCv1 =>:
- No changes
NOTE: The Linux LED driver does currently have: values bd72720-grnled and bd72720-ambled for the rohm,led-compatible. These are handled identically to the existing bd71828-grnled and bd71828-ambled and should be removed from the driver. Thus they are not documented in the binding document.
Furthermore, the BD72720 Linux driver does not use the compatible property from the LED node. The Linux driver is load and probed based on the PMIC compatible in the MFD node. Thus no compatible string for the BD72720 LED node is added.
--- .../devicetree/bindings/leds/rohm,bd71828-leds.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml +4 -3
@@ -10,11 +10,12 @@ maintainers: - Matti Vaittinen <[email protected]> description: | - This module is part of the ROHM BD71828 MFD device. For more details - see Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml. + This module is part of the ROHM BD71828 and BD72720 MFD device. For more + details see Documentation/devicetree/bindings/mfd/rohm,bd71828-pmic.yaml + and Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml The LED controller is represented as a sub-node of the PMIC node on the device - tree. + tree. This should be located under "leds" - node in PMIC node. The device has two LED outputs referred as GRNLED and AMBLED in data-sheet.
Signature · 1 line
2.51.1
PATCH v5 7/16 mfd: rohm-bd71828: Use regmap_reg_range()
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The regmap range tables tend to be somewhat verbose. Using the regmap_reg_range() can make the definitions slightly mode compact.
Tidy the regmap range tables by using the regmap_reg_range().
---
Revision history:
v2 => :
- no changes
RFCv1 => v2:
- New patch
--- drivers/mfd/rohm-bd71828.c | 64 +++++++++++--------------------------- 1 file changed, 18 insertions(+), 46 deletions(-)
drivers/mfd/rohm-bd71828.c +18 -46
@@ -157,55 +157,27 @@ static struct mfd_cell bd71828_mfd_cells[] = { };static const struct regmap_range bd71815_volatile_ranges[] = { - { - .range_min =BD71815_REG_SEC , - .range_max =BD71815_REG_YEAR , - }, { - .range_min =BD71815_REG_CONF , - .range_max =BD71815_REG_BAT_TEMP , - }, { - .range_min =BD71815_REG_VM_IBAT_U , - .range_max =BD71815_REG_CC_CTRL , - }, { - .range_min =BD71815_REG_CC_STAT , - .range_max =BD71815_REG_CC_CURCD_L , - }, { - .range_min =BD71815_REG_VM_BTMP_MON , - .range_max =BD71815_REG_VM_BTMP_MON , - }, { - .range_min =BD71815_REG_INT_STAT , - .range_max =BD71815_REG_INT_UPDATE , - }, { - .range_min =BD71815_REG_VM_VSYS_U , - .range_max =BD71815_REG_REX_CTRL_1 , - }, { - .range_min =BD71815_REG_FULL_CCNTD_3 , - .range_max =BD71815_REG_CCNTD_CHG_2 , - }, +regmap_reg_range (BD71815_REG_SEC ,BD71815_REG_YEAR ), +regmap_reg_range (BD71815_REG_CONF ,BD71815_REG_BAT_TEMP ), +regmap_reg_range (BD71815_REG_VM_IBAT_U ,BD71815_REG_CC_CTRL ), +regmap_reg_range (BD71815_REG_CC_STAT ,BD71815_REG_CC_CURCD_L ), +regmap_reg_range (BD71815_REG_VM_BTMP_MON ,BD71815_REG_VM_BTMP_MON ), +regmap_reg_range (BD71815_REG_INT_STAT ,BD71815_REG_INT_UPDATE ), +regmap_reg_range (BD71815_REG_VM_VSYS_U ,BD71815_REG_REX_CTRL_1 ), +regmap_reg_range (BD71815_REG_FULL_CCNTD_3 ,BD71815_REG_CCNTD_CHG_2 ), };static const struct regmap_range bd71828_volatile_ranges[] = { - { - .range_min =BD71828_REG_PS_CTRL_1 , - .range_max =BD71828_REG_PS_CTRL_1 , - }, { - .range_min =BD71828_REG_PS_CTRL_3 , - .range_max =BD71828_REG_PS_CTRL_3 , - }, { - .range_min =BD71828_REG_RTC_SEC , - .range_max =BD71828_REG_RTC_YEAR , - }, { -/* -* For now make all charger registers volatile because many -* needs to be and because the charger block is not that -* performance critical. -*/ - .range_min =BD71828_REG_CHG_STATE , - .range_max =BD71828_REG_CHG_FULL , - }, { - .range_min =BD71828_REG_INT_MAIN , - .range_max =BD71828_REG_IO_STAT , - }, +regmap_reg_range (BD71828_REG_PS_CTRL_1 ,BD71828_REG_PS_CTRL_1 ), +regmap_reg_range (BD71828_REG_PS_CTRL_3 ,BD71828_REG_PS_CTRL_3 ), +regmap_reg_range (BD71828_REG_RTC_SEC ,BD71828_REG_RTC_YEAR ), +/* +* For now make all charger registers volatile because many +* needs to be and because the charger block is not that +* performance critical. +*/ +regmap_reg_range (BD71828_REG_CHG_STATE ,BD71828_REG_CHG_FULL ), +regmap_reg_range (BD71828_REG_INT_MAIN ,BD71828_REG_IO_STAT ), };static const struct regmap_access_table bd71815_volatile_regs = {
Signature · 1 line
2.51.1
Lee Jones
maintainerRe: [PATCH v5 07/16] mfd: rohm-bd71828: Use regmap_reg_range()
Quoted 14 lines · Matti Vaittinen
From: Matti Vaittinen <[email protected]>
The regmap range tables tend to be somewhat verbose. Using the
regmap_reg_range()can make the definitions slightly mode compact.Tidy the regmap range tables by using the
regmap_reg_range().Signed-off-by Matti Vaittinen <[email protected]>---
Revision history:
v2 => :
- no changes
RFCv1 => v2:
- New patch
Quoted 3 lines
--- drivers/mfd/rohm-bd71828.c | 64 +++++++++++--------------------------- 1 file changed, 18 insertions(+), 46 deletions(-)
LGTM.
Once everything is in order, I plan to merge the set through MFD.
Signature · 1 line
Lee Jones [李琼斯]
PATCH v5 8/16 mfd: bd71828: Support ROHM BD72720
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a power management IC which continues the BD71828 family of PMICs. Similarly to the BD71815 and BD71828, the BD72720 integrates regulators, charger, RTC, clock gate and GPIOs.
The main difference to the earlier PMICs is that the BD72720 has two different I2C slave addresses. In addition to the registers behind the 'main I2C address', most of the charger (and to some extent LED) control is done via registers behind a 'secondary I2C slave address', 0x4c.
---
Revision history:
v2 =>:
- no changes
RFCv1 => v2: (Mostly addressed comments from Lee and Andreas)
- Use stacked regmaps to avoid platform data and the tango with multiple regmaps in the power-supply driver
- Use regmap_reg_range()
- make it clear bd72720_irq_type_base is an array
- tab-out definitions in the bd72720 header
- minor styling
Note: This patch depends on the series: "power: supply: add charger for BD71828" by Andreas:
https://lore.kernel.org/all/[email protected]/
There are some new variants being planned. Most notably, the BD73900 should be almost identical to the BD72720 - for everything else except the charger block.
--- drivers/mfd/Kconfig | 18 +- drivers/mfd/rohm-bd71828.c | 488 +++++++++++++++++++++++- include/linux/mfd/rohm-bd72720.h | 634 +++++++++++++++++++++++++++++++ include/linux/mfd/rohm-generic.h | 1 + 4 files changed, 1126 insertions(+), 15 deletions(-) create mode 100644 include/linux/mfd/rohm-bd72720.h
drivers/mfd/Kconfig +10 -8
@@ -2211,20 +2211,22 @@ config MFD_ROHM_BD718XX and emergency shut down as well as 32,768KHz clock output. config MFD_ROHM_BD71828 - tristate "ROHM BD71828 and BD71815 Power Management IC" + tristate "ROHM BD718[15/28/79], BD72720 and BD73900 PMICs" depends on I2C=y depends on OF select REGMAP_I2C select REGMAP_IRQ select MFD_CORE help - Select this option to get support for the ROHM BD71828 and BD71815 - Power Management ICs. BD71828GW and BD71815AGW are single-chip power - management ICs mainly for battery-powered portable devices. - The BD71828 integrates 7 buck converters and 7 LDOs. The BD71815 - has 5 bucks, 7 LDOs, and a boost for driving LEDs. Both ICs provide - also a single-cell linear charger, a Coulomb counter, a real-time - clock (RTC), GPIOs and a 32.768 kHz clock gate. + Select this option to get support for the ROHM BD71815, BD71828, + BD71879, BD72720 and BD73900 Power Management ICs. These are + single-chip power management ICs mainly for battery-powered portable + devices. + The BD71815 has 5 bucks, 7 LDOs, and a boost for driving LEDs. + The BD718[28/79] have 7 buck converters and 7 LDOs. + The BD72720 and the BD73900 have 10 bucks and 11 LDOs. + All ICs provide a single-cell linear charger, a Coulomb counter, + a real-time clock (RTC), GPIOs and a 32.768 kHz clock gate. config MFD_ROHM_BD957XMUF tristate "ROHM BD9576MUF and BD9573MUF Power Management ICs"
drivers/mfd/rohm-bd71828.c +481 -7
603 lines not on this page · raw message
include/linux/mfd/rohm-bd72720.h new file +634 -0
634 lines not on this page · raw message
include/linux/mfd/rohm-generic.h +1 -0
@@ -16,6 +16,7 @@ enum rohm_chip_type {ROHM_CHIP_TYPE_BD71828 ,ROHM_CHIP_TYPE_BD71837 ,ROHM_CHIP_TYPE_BD71847 , +ROHM_CHIP_TYPE_BD72720 ,ROHM_CHIP_TYPE_BD96801 ,ROHM_CHIP_TYPE_BD96802 , ROHM_CHIP_TYPE_BD96805,
Signature · 1 line
2.51.1
Lee Jones
maintainerRe: [PATCH v5 08/16] mfd: bd71828: Support ROHM BD72720
Quoted 57 lines · Matti Vaittinen
From: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a power management IC which continues the BD71828 family of PMICs. Similarly to the BD71815 and BD71828, the BD72720 integrates regulators, charger, RTC, clock gate and GPIOs.
The main difference to the earlier PMICs is that the BD72720 has two different I2C slave addresses. In addition to the registers behind the 'main I2C address', most of the charger (and to some extent LED) control is done via registers behind a 'secondary I2C slave address',
0x4c.Signed-off-by Matti Vaittinen <[email protected]>---
Revision history:
v2 =>:
- no changesRFCv1 => v2: (Mostly addressed comments from Lee and Andreas)
- Use stacked regmaps to avoid platform data and the tango with multiple regmaps in the power-supply driver
- Useregmap_reg_range()
- make it clearbd72720_irq_type_baseis an array
- tab-out definitions in the bd72720 header
- minor stylingNote: This patch depends on the series: "power: supply: add charger for BD71828" by Andreas:
https://lore.kernel.org/all/[email protected]/There are some new variants being planned. Most notably, the BD73900 should be almost identical to the BD72720 - for everything else except the charger block.
--- drivers/mfd/Kconfig | 18 +- drivers/mfd/rohm-bd71828.c | 488 +++++++++++++++++++++++- include/linux/mfd/rohm-bd72720.h | 634 +++++++++++++++++++++++++++++++ include/linux/mfd/rohm-generic.h | 1 + 4 files changed, 1126 insertions(+), 15 deletions(-) create mode 100644 include/linux/mfd/rohm-bd72720.hdrivers/mfd/Kconfig +1
-1@@ -2211,20 +2211,22 @@ config MFD_ROHM_BD718XX and emergency shut down as well as 32,768KHz clock output. config MFD_ROHM_BD71828 - tristate "ROHM BD71828 and BD71815 Power Management IC" + tristate "ROHM BD718[15/28/79], BD72720 and BD73900 PMICs" depends on I2C=y depends on OF select REGMAP_I2C select REGMAP_IRQ select MFD_CORE help
drivers/mfd/Kconfig config MFD_ROHM_BD718XX · line 2223
Quoted 10 lines
drivers/mfd/Kconfig +3
-7- Select this option to get support for the ROHM BD71828 and BD71815 - Power Management ICs. BD71828GW and BD71815AGW are single-chip power - management ICs mainly for battery-powered portable devices. - The BD71828 integrates 7 buck converters and 7 LDOs. The BD71815 - has 5 bucks, 7 LDOs, and a boost for driving LEDs. Both ICs provide - also a single-cell linear charger, a Coulomb counter, a real-time - clock (RTC), GPIOs and a 32.768 kHz clock gate. + Select this option to get support for the ROHM BD71815, BD71828, + BD71879, BD72720 and BD73900 Power Management ICs. These are + single-chip power management ICs mainly for battery-powered portable
Nit: Power Management ICs (PMIC)
drivers/mfd/Kconfig config MFD_ROHM_BD718XX · line 2229
Quoted 6 lines
drivers/mfd/Kconfig +6
-0+ devices. + The BD71815 has 5 bucks, 7 LDOs, and a boost for driving LEDs. + The BD718[28/79] have 7 buck converters and 7 LDOs. + The BD72720 and the BD73900 have 10 bucks and 11 LDOs. + All ICs provide a single-cell linear charger, a Coulomb counter, + a real-time clock (RTC), GPIOs and a 32.768 kHz clock gate.
Nit: Real-Time Clock (RTC)
drivers/mfd/rohm-bd71828.c line 5
Quoted 13 lines
drivers/mfd/Kconfig +0
-0config MFD_ROHM_BD957XMUF tristate "ROHM BD9576MUF and BD9573MUF Power Management ICs"drivers/mfd/rohm-bd71828.c +1
-1@@ -2,7 +2,7 @@// // Copyright (C) 2019 ROHM Semiconductors // -// ROHM BD71828/BD71815 PMIC driver +// ROHM BD718[15/28/79] and BD72720 PMIC driver
Looks like this header format slipped in.
I would appreciate a follow-up patch to change it to standard C multi-line format (except the SPDX line).
Quoted 135 lines
drivers/mfd/rohm-bd71828.c +102
-0#include <linux/gpio_keys.h> #include <linux/i2c.h> @@ -13,12 +13,29 @@#include <linux/mfd/core.h> #include <linux/mfd/rohm-bd71815.h> #include <linux/mfd/rohm-bd71828.h> +#include <linux/mfd/rohm-bd72720.h> #include <linux/mfd/rohm-generic.h> #include <linux/module.h> #include <linux/of.h> #include <linux/regmap.h> #include <linux/types.h> +#define BD72720_TYPED_IRQ_REG (_irq, _stat_offset, _mask, _type_offset) \ + [_irq] = { \ + .reg_offset = (_stat_offset), \ + .mask = (_mask), \ + { \ + .type_reg_offset = (_type_offset), \ + .type_reg_mask = BD72720_GPIO_IRQ_TYPE_MASK, \ + .type_rising_val = BD72720_GPIO_IRQ_TYPE_RISING, \ + .type_falling_val = BD72720_GPIO_IRQ_TYPE_FALLING, \ + .type_level_low_val = BD72720_GPIO_IRQ_TYPE_LOW, \ + .type_level_high_val = BD72720_GPIO_IRQ_TYPE_HIGH, \ + .types_supported = IRQ_TYPE_EDGE_BOTH | \ + IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW, \ + }, \ + } +static struct gpio_keys_button button = { .code =KEY_POWER , .gpio =-1 ,@@ -43,6 +60,12 @@ static const struct resource bd71828_rtc_irqs[] = { DEFINE_RES_IRQ_NAMED(BD71828_INT_RTC2, "bd70528-rtc-alm-2"), }; +static const struct resource bd72720_rtc_irqs[] = { +DEFINE_RES_IRQ_NAMED (BD72720_INT_RTC0 ,"bd70528-rtc-alm-0" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_RTC1 ,"bd70528-rtc-alm-1" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_RTC2 ,"bd70528-rtc-alm-2" ), +}; +static const struct resource bd71815_power_irqs[] = {DEFINE_RES_IRQ_NAMED (BD71815_INT_DCIN_RMV ,"bd71815-dcin-rmv" ),DEFINE_RES_IRQ_NAMED (BD71815_INT_CLPS_OUT ,"bd71815-dcin-clps-out" ),@@ -156,6 +179,74 @@ static struct mfd_cell bd71828_mfd_cells[] = { }, }; +static const struct resource bd72720_power_irqs[] = { +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBUS_RMV ,"bd72720_int_vbus_rmv" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBUS_DET ,"bd72720_int_vbus_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBUS_MON_RES ,"bd72720_int_vbus_mon_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBUS_MON_DET ,"bd72720_int_vbus_mon_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_MON_RES ,"bd72720_int_vsys_mon_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_MON_DET ,"bd72720_int_vsys_mon_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_UV_RES ,"bd72720_int_vsys_uv_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_UV_DET ,"bd72720_int_vsys_uv_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_LO_RES ,"bd72720_int_vsys_lo_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_LO_DET ,"bd72720_int_vsys_lo_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_OV_RES ,"bd72720_int_vsys_ov_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VSYS_OV_DET ,"bd72720_int_vsys_ov_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_ILIM ,"bd72720_int_bat_ilim" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CHG_DONE ,"bd72720_int_chg_done" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_EXTEMP_TOUT ,"bd72720_int_extemp_tout" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CHG_WDT_EXP ,"bd72720_int_chg_wdt_exp" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_MNT_OUT ,"bd72720_int_bat_mnt_out" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_MNT_IN ,"bd72720_int_bat_mnt_in" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CHG_TRNS ,"bd72720_int_chg_trns" ), + +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_MON_RES ,"bd72720_int_vbat_mon_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_MON_DET ,"bd72720_int_vbat_mon_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_SHT_RES ,"bd72720_int_vbat_sht_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_SHT_DET ,"bd72720_int_vbat_sht_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_LO_RES ,"bd72720_int_vbat_lo_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_LO_DET ,"bd72720_int_vbat_lo_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_OV_RES ,"bd72720_int_vbat_ov_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_VBAT_OV_DET ,"bd72720_int_vbat_ov_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_RMV ,"bd72720_int_bat_rmv" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_DET ,"bd72720_int_bat_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_DBAT_DET ,"bd72720_int_dbat_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_BAT_TEMP_TRNS ,"bd72720_int_bat_temp_trns" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_LOBTMP_RES ,"bd72720_int_lobtmp_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_LOBTMP_DET ,"bd72720_int_lobtmp_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OVBTMP_RES ,"bd72720_int_ovbtmp_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OVBTMP_DET ,"bd72720_int_ovbtmp_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR1_RES ,"bd72720_int_ocur1_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR1_DET ,"bd72720_int_ocur1_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR2_RES ,"bd72720_int_ocur2_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR2_DET ,"bd72720_int_ocur2_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR3_RES ,"bd72720_int_ocur3_res" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_OCUR3_DET ,"bd72720_int_ocur3_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CC_MON1_DET ,"bd72720_int_cc_mon1_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CC_MON2_DET ,"bd72720_int_cc_mon2_det" ), +DEFINE_RES_IRQ_NAMED (BD72720_INT_CC_MON3_DET ,"bd72720_int_cc_mon3_det" ), +}; + +static const struct mfd_cell bd72720_mfd_cells[] = { + { .name ="bd72720-pmic" , }, + { .name ="bd72720-gpio" , }, + { .name ="bd72720-led" , }, + { .name ="bd72720-clk" , }, + { + .name ="bd72720-power" , + .resources = bd72720_power_irqs, + .num_resources =ARRAY_SIZE (bd72720_power_irqs), + }, { + .name ="bd72720-rtc" , + .resources = bd72720_rtc_irqs, + .num_resources =ARRAY_SIZE (bd72720_rtc_irqs), + }, { + .name ="gpio-keys" , + .platform_data = &bd71828_powerkey_data, + .pdata_size =sizeof (bd71828_powerkey_data), + }, +}; +static const struct regmap_range bd71815_volatile_ranges[] = {regmap_reg_range (BD71815_REG_SEC ,BD71815_REG_YEAR ),regmap_reg_range (BD71815_REG_CONF ,BD71815_REG_BAT_TEMP ),@@ -180,6 +271,87 @@ static const struct regmap_range bd71828_volatile_ranges[] = { regmap_reg_range(BD71828_REG_INT_MAIN, BD71828_REG_IO_STAT), }; +static const struct regmap_range bd72720_volatile_ranges_4b[] = { +regmap_reg_range (BD72720_REG_RESETSRC_1 ,BD72720_REG_RESETSRC_2 ), +regmap_reg_range (BD72720_REG_POWER_STATE ,BD72720_REG_POWER_STATE ), +/* The state indicator bit changes when new state is reached */ +regmap_reg_range (BD72720_REG_PS_CTRL_1 ,BD72720_REG_PS_CTRL_1 ), +regmap_reg_range (BD72720_REG_RCVNUM ,BD72720_REG_RCVNUM ), +regmap_reg_range (BD72720_REG_CONF ,BD72720_REG_HALL_STAT ), +regmap_reg_range (BD72720_REG_RTC_SEC ,BD72720_REG_RTC_YEAR ), +regmap_reg_range (BD72720_REG_INT_LVL1_STAT ,BD72720_REG_INT_ETC2_SRC ), +}; +
drivers/mfd/rohm-bd71828.c static const struct regmap_range bd71828_volatile_ranges[] = { · line 294
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +10
-0+static const struct regmap_range bd72720_precious_ranges_4b[] = { +regmap_reg_range (BD72720_REG_INT_LVL1_STAT ,BD72720_REG_INT_ETC2_STAT ), +}; + +/* +* The BD72720 is an odd beast in that it contains two separate sets of +* registers, both starting from address 0x0. The twist is that these "pages" +* are behind different I2C slave addresses. Most of the registers are behind +* a slave address 0x4b, which will be used as the "main" address for this +* device.
New paragraph, new line?
drivers/mfd/rohm-bd71828.c static const struct regmap_range bd71828_volatile_ranges[] = { · line 304
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +10
-0+* Most of the charger related registers are located behind slave address 0x4c. +* It is tempting to push the dealing with the charger registers and the extra +* 0x4c device in power-supply driver - but perhaps it's better for the sake of +* the cleaner re-use to deal with setting up all of the regmaps here. +* Furthermore, the LED stuff may need access to both of these devices. +* +* Instead of providing one of the regmaps to sub-devices in MFD platform data, +* we create one more 'wrapper regmap' with custom read/write operations. These +* custom accessors will select which of the 'real' regmaps to use, based on +* the register address.
As above.
Quoted 14 lines
drivers/mfd/rohm-bd71828.c +14
-0+* The register addresses are 8-bit, so we add offset 0x100 to the addresses +* behind the secondary slave 0x4c. The 'wrapper' regmap can then detect the +* correct slave address based on the register address and call regmap_write() +* and regmap_read() using correct 'real' regmap. This way the registers of +* both of the slaves can be accessed using one 'wrapper' regmap. +* +* NOTE: The added offsets mean that the defined addresses for slave 0x4c must +* be used through the 'wrapper' regmap because the offset must be stripped +* from the register addresses. The 0x4b can be accessed both indirectly using +* the 'wrapper' regmap, and directly using the 'real' regmap. +*/ +#define BD72720_SECONDARY_I2C_SLAVE 0x4c + +struct bd72720_regmaps {
drivers/mfd/rohm-bd71828.c static const struct regmap_range bd71828_volatile_ranges[] = { · line 328
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +10
-0+struct regmap *map1_4b; +struct regmap *map2_4c; +}; + +/* Translate the slave 0x4c wrapper register address to a real one */ +#define BD72720_REG_UNWRAP (reg) ((reg) - 0x100) + +/* Ranges given to 'real' 0x4c regmap must use unwrapped addresses. */ +#define BD72720_UNWRAP_REG_RANGE (startreg, endreg) \ + regmap_reg_range(BD72720_REG_UNWRAP(startreg), BD72720_REG_UNWRAP(endreg))
'\n' here please.
Quoted 52 lines
drivers/mfd/rohm-bd71828.c +41
-0+static const struct regmap_range bd72720_volatile_ranges_4c[] = { +/* Status information */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_CHG_STATE ,BD72720_REG_CHG_EN ), +/* +* Under certain circumstances, write to some bits may be +* ignored +*/ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_CHG_CTRL ,BD72720_REG_CHG_CTRL ), +/* +* TODO: Ensure this is used to advertise state, not (only?) to +* control it. +*/ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_VSYS_STATE_STAT ,BD72720_REG_VSYS_STATE_STAT ), +/* Measured data */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_VM_VBAT_U ,BD72720_REG_VM_VF_L ), +/* Self clearing bits */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_VM_VSYS_SA_MINMAX_CTRL , +BD72720_REG_VM_VSYS_SA_MINMAX_CTRL ), +/* Counters, self clearing bits */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_CC_CURCD_U ,BD72720_REG_CC_CTRL ), +/* Self clearing bits */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_CC_CCNTD_CTRL ,BD72720_REG_CC_CCNTD_CTRL ), +/* Self clearing bits */ +BD72720_UNWRAP_REG_RANGE (BD72720_REG_IMPCHK_CTRL ,BD72720_REG_IMPCHK_CTRL ), +}; +static const struct regmap_access_table bd71815_volatile_regs = { .yes_ranges = &bd71815_volatile_ranges[0 ], .n_yes_ranges =ARRAY_SIZE (bd71815_volatile_ranges),@@ -190,6 +362,21 @@ static const struct regmap_access_table bd71828_volatile_regs = { .n_yes_ranges = ARRAY_SIZE(bd71828_volatile_ranges), }; +static const struct regmap_access_table bd72720_volatile_regs_4b = { + .yes_ranges = &bd72720_volatile_ranges_4b[0 ], + .n_yes_ranges =ARRAY_SIZE (bd72720_volatile_ranges_4b), +}; + +static const struct regmap_access_table bd72720_precious_regs_4b = { + .yes_ranges = &bd72720_precious_ranges_4b[0 ], + .n_yes_ranges =ARRAY_SIZE (bd72720_precious_ranges_4b), +}; + +static const struct regmap_access_table bd72720_volatile_regs_4c = { + .yes_ranges = &bd72720_volatile_ranges_4c[0 ], + .n_yes_ranges =ARRAY_SIZE (bd72720_volatile_ranges_4c), +}; +static const struct regmap_config bd71815_regmap = { .reg_bits =8 , .val_bits =8 ,
drivers/mfd/rohm-bd71828.c static const struct regmap_config bd71828_regmap = { · line 400
Quoted 8 lines
drivers/mfd/rohm-bd71828.c +5
-0@@ -206,10 +393,79 @@ static const struct regmap_config bd71828_regmap = { .cache_type = REGCACHE_MAPLE, }; +static int regmap_write_wrapper (void *context,unsigned int reg,unsigned int val) +{ +struct bd72720_regmaps *maps = context; + +if (reg <0x100 )
Define this to something human readable please.
Some kind of PAGE or BOUNDARY. Perhaps something better.
drivers/mfd/rohm-bd71828.c static const struct regmap_config bd71828_regmap = { · line 412
Quoted 12 lines
drivers/mfd/rohm-bd71828.c +12
-0+return regmap_write (maps->map1_4b, reg, val); + + reg =BD72720_REG_UNWRAP (reg); + +return regmap_write (maps->map2_4c, reg, val); +} + +static int regmap_read_wrapper (void *context,unsigned int reg,unsigned int *val) +{ +struct bd72720_regmaps *maps = context; + +if (reg <0x100 )
Likewise.
Quoted 213 lines
drivers/mfd/rohm-bd71828.c +184
-1+return regmap_read (maps->map1_4b, reg, val); + + reg =BD72720_REG_UNWRAP (reg); + +return regmap_read (maps->map2_4c, reg, val); +} + +static const struct regmap_config bd72720_wrapper_map_config = { + .name ="wrap-map" , + .reg_bits =9 , + .val_bits =8 , + .max_register =BD72720_REG_IMPCHK_CTRL , +/* +* We don't want to duplicate caches. It would be a bit faster to +* have the cache in this 'wrapper regmap', and not in the 'real +* regmaps' bd72720_regmap_4b and bd72720_regmap_4c below. This would +* require all the subdevices to use the wrapper-map in order to be +* able to benefit from the cache. +* Currently most of the sub-devices use only the same slave-address +* as this MFD driver. Now, because we don't add the offset to the +* registers belonging to this slave, those devices can use either the +* wrapper map, or the bd72720_regmap_4b directly. This means majority +* of our sub devices don't need to care which regmap they get using +* the dev_get_regmap(). This unifies the code between the BD72720 and +* those variants which don't have this 'multiple slave addresses' +* -hassle. +* So, for a small performance penalty, we simplify the code for the +* sub-devices by having the caches in the wrapped regmaps and not here. +*/ + .cache_type =REGCACHE_NONE , + .reg_write = regmap_write_wrapper, + .reg_read = regmap_read_wrapper, +}; + +static const struct regmap_config bd72720_regmap_4b = { + .reg_bits =8 , + .val_bits =8 , + .volatile_table = &bd72720_volatile_regs_4b, + .precious_table = &bd72720_precious_regs_4b, + .max_register =BD72720_REG_INT_ETC2_SRC , + .cache_type =REGCACHE_MAPLE , +}; + +static const struct regmap_config bd72720_regmap_4c = { + .reg_bits =8 , + .val_bits =8 , + .volatile_table = &bd72720_volatile_regs_4c, + .max_register =BD72720_REG_UNWRAP (BD72720_REG_IMPCHK_CTRL ), + .cache_type =REGCACHE_MAPLE , +}; +/* * Mapping of main IRQ register bits to sub-IRQ register offsets so that we can * access corect sub-IRQ registers based on bits that are set in main IRQ -* register. BD71815 and BD71828 have same sub-register-block offests. +* register. BD71815 and BD71828 have same sub-register-block offests, the +* BD72720 has a different one. */ static unsigned int bit0_offsets[] = {11 };/* RTC IRQ */ @@ -221,6 +477,15 @@ static unsigned int bit5_offsets[] = {3}; /* VSYS IRQ */static unsigned int bit6_offsets[] = {1 ,2 };/* DCIN IRQ */ static unsigned int bit7_offsets[] = {0 };/* BUCK IRQ */ +static unsigned int bd72720_bit0_offsets[] = {0 ,1 };/* PS1 and PS2 */ +static unsigned int bd72720_bit1_offsets[] = {2 ,3 };/* DVS1 and DVS2 */ +static unsigned int bd72720_bit2_offsets[] = {4 };/* VBUS */ +static unsigned int bd72720_bit3_offsets[] = {5 };/* VSYS */ +static unsigned int bd72720_bit4_offsets[] = {6 };/* CHG */ +static unsigned int bd72720_bit5_offsets[] = {7 ,8 };/* BAT1 and BAT2 */ +static unsigned int bd72720_bit6_offsets[] = {9 };/* IBAT */ +static unsigned int bd72720_bit7_offsets[] = {10 ,11 };/* ETC1 and ETC2 */ +static const struct regmap_irq_sub_irq_map bd718xx_sub_irq_offsets[] = {REGMAP_IRQ_MAIN_REG_OFFSET (bit0_offsets),REGMAP_IRQ_MAIN_REG_OFFSET (bit1_offsets),@@ -232,6 +497,17 @@ static const struct regmap_irq_sub_irq_map bd718xx_sub_irq_offsets[] = { REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), }; +static const struct regmap_irq_sub_irq_map bd72720_sub_irq_offsets[] = { +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit0_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit1_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit2_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit3_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit4_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit5_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit6_offsets), +REGMAP_IRQ_MAIN_REG_OFFSET (bd72720_bit7_offsets), +}; +static const struct regmap_irq bd71815_irqs[] = {REGMAP_IRQ_REG (BD71815_INT_BUCK1_OCP ,0 ,BD71815_INT_BUCK1_OCP_MASK ),REGMAP_IRQ_REG (BD71815_INT_BUCK2_OCP ,0 ,BD71815_INT_BUCK2_OCP_MASK ),@@ -405,6 +681,117 @@ static const struct regmap_irq bd71828_irqs[] = { REGMAP_IRQ_REG(BD71828_INT_RTC2, 11, BD71828_INT_RTC2_MASK), }; +static const struct regmap_irq bd72720_irqs[] = { +REGMAP_IRQ_REG (BD72720_INT_LONGPUSH ,0 ,BD72720_INT_LONGPUSH_MASK ), +REGMAP_IRQ_REG (BD72720_INT_MIDPUSH ,0 ,BD72720_INT_MIDPUSH_MASK ), +REGMAP_IRQ_REG (BD72720_INT_SHORTPUSH ,0 ,BD72720_INT_SHORTPUSH_MASK ), +REGMAP_IRQ_REG (BD72720_INT_PUSH ,0 ,BD72720_INT_PUSH_MASK ), +REGMAP_IRQ_REG (BD72720_INT_HALL_DET ,0 ,BD72720_INT_HALL_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_HALL_TGL ,0 ,BD72720_INT_HALL_TGL_MASK ), +REGMAP_IRQ_REG (BD72720_INT_WDOG ,0 ,BD72720_INT_WDOG_MASK ), +REGMAP_IRQ_REG (BD72720_INT_SWRESET ,0 ,BD72720_INT_SWRESET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_SEQ_DONE ,1 ,BD72720_INT_SEQ_DONE_MASK ), +REGMAP_IRQ_REG (BD72720_INT_PGFAULT ,1 ,BD72720_INT_PGFAULT_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK1_DVS ,2 ,BD72720_INT_BUCK1_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK2_DVS ,2 ,BD72720_INT_BUCK2_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK3_DVS ,2 ,BD72720_INT_BUCK3_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK4_DVS ,2 ,BD72720_INT_BUCK4_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK5_DVS ,2 ,BD72720_INT_BUCK5_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK6_DVS ,2 ,BD72720_INT_BUCK6_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK7_DVS ,2 ,BD72720_INT_BUCK7_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK8_DVS ,2 ,BD72720_INT_BUCK8_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK9_DVS ,3 ,BD72720_INT_BUCK9_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BUCK10_DVS ,3 ,BD72720_INT_BUCK10_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LDO1_DVS ,3 ,BD72720_INT_LDO1_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LDO2_DVS ,3 ,BD72720_INT_LDO2_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LDO3_DVS ,3 ,BD72720_INT_LDO3_DVS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LDO4_DVS ,3 ,BD72720_INT_LDO4_DVS_MASK ), + +REGMAP_IRQ_REG (BD72720_INT_VBUS_RMV ,4 ,BD72720_INT_VBUS_RMV_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBUS_DET ,4 ,BD72720_INT_VBUS_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBUS_MON_RES ,4 ,BD72720_INT_VBUS_MON_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBUS_MON_DET ,4 ,BD72720_INT_VBUS_MON_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_MON_RES ,5 ,BD72720_INT_VSYS_MON_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_MON_DET ,5 ,BD72720_INT_VSYS_MON_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_UV_RES ,5 ,BD72720_INT_VSYS_UV_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_UV_DET ,5 ,BD72720_INT_VSYS_UV_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_LO_RES ,5 ,BD72720_INT_VSYS_LO_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_LO_DET ,5 ,BD72720_INT_VSYS_LO_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_OV_RES ,5 ,BD72720_INT_VSYS_OV_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VSYS_OV_DET ,5 ,BD72720_INT_VSYS_OV_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_ILIM ,6 ,BD72720_INT_BAT_ILIM_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CHG_DONE ,6 ,BD72720_INT_CHG_DONE_MASK ), +REGMAP_IRQ_REG (BD72720_INT_EXTEMP_TOUT ,6 ,BD72720_INT_EXTEMP_TOUT_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CHG_WDT_EXP ,6 ,BD72720_INT_CHG_WDT_EXP_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_MNT_OUT ,6 ,BD72720_INT_BAT_MNT_OUT_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_MNT_IN ,6 ,BD72720_INT_BAT_MNT_IN_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CHG_TRNS ,6 ,BD72720_INT_CHG_TRNS_MASK ), + +REGMAP_IRQ_REG (BD72720_INT_VBAT_MON_RES ,7 ,BD72720_INT_VBAT_MON_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_MON_DET ,7 ,BD72720_INT_VBAT_MON_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_SHT_RES ,7 ,BD72720_INT_VBAT_SHT_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_SHT_DET ,7 ,BD72720_INT_VBAT_SHT_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_LO_RES ,7 ,BD72720_INT_VBAT_LO_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_LO_DET ,7 ,BD72720_INT_VBAT_LO_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_OV_RES ,7 ,BD72720_INT_VBAT_OV_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VBAT_OV_DET ,7 ,BD72720_INT_VBAT_OV_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_RMV ,8 ,BD72720_INT_BAT_RMV_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_DET ,8 ,BD72720_INT_BAT_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_DBAT_DET ,8 ,BD72720_INT_DBAT_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_BAT_TEMP_TRNS ,8 ,BD72720_INT_BAT_TEMP_TRNS_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LOBTMP_RES ,8 ,BD72720_INT_LOBTMP_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_LOBTMP_DET ,8 ,BD72720_INT_LOBTMP_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OVBTMP_RES ,8 ,BD72720_INT_OVBTMP_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OVBTMP_DET ,8 ,BD72720_INT_OVBTMP_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR1_RES ,9 ,BD72720_INT_OCUR1_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR1_DET ,9 ,BD72720_INT_OCUR1_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR2_RES ,9 ,BD72720_INT_OCUR2_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR2_DET ,9 ,BD72720_INT_OCUR2_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR3_RES ,9 ,BD72720_INT_OCUR3_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_OCUR3_DET ,9 ,BD72720_INT_OCUR3_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CC_MON1_DET ,10 ,BD72720_INT_CC_MON1_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CC_MON2_DET ,10 ,BD72720_INT_CC_MON2_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_CC_MON3_DET ,10 ,BD72720_INT_CC_MON3_DET_MASK ), +/* +* The GPIO1_IN and GPIO2_IN IRQs are generated from the PMIC's GPIO1 and GPIO2 +* pins. Eg, they may be wired to other devices which can then use the PMIC as +* an interrupt controller. The GPIO1 and GPIO2 can have the IRQ type +* specified. All of the types (falling, rising, and both edges as well as low +* and high levels) are supported. +*/ +BD72720_TYPED_IRQ_REG (BD72720_INT_GPIO1_IN ,10 ,BD72720_INT_GPIO1_IN_MASK ,0 ), +BD72720_TYPED_IRQ_REG (BD72720_INT_GPIO2_IN ,10 ,BD72720_INT_GPIO2_IN_MASK ,1 ), +REGMAP_IRQ_REG (BD72720_INT_VF125_RES ,11 ,BD72720_INT_VF125_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VF125_DET ,11 ,BD72720_INT_VF125_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VF_RES ,11 ,BD72720_INT_VF_RES_MASK ), +REGMAP_IRQ_REG (BD72720_INT_VF_DET ,11 ,BD72720_INT_VF_DET_MASK ), +REGMAP_IRQ_REG (BD72720_INT_RTC0 ,11 ,BD72720_INT_RTC0_MASK ), +REGMAP_IRQ_REG (BD72720_INT_RTC1 ,11 ,BD72720_INT_RTC1_MASK ), +REGMAP_IRQ_REG (BD72720_INT_RTC2 ,11 ,BD72720_INT_RTC2_MASK ), +}; + +static int bd72720_set_type_config (unsigned int **buf,unsigned int type, +const struct regmap_irq *irq_data, +int idx,void *irq_drv_data) +{ +const struct regmap_irq_type *t = &irq_data->type; + +/* +* The regmap IRQ ecpects IRQ_TYPE_EDGE_BOTH to be written to register +* as logical OR of the type_falling_val and type_rising_val. This is +* not how the BD72720 implements this configuration, hence we need +* to handle this specific case separately. +*/ +if (type ==IRQ_TYPE_EDGE_BOTH ) { + buf[0 ][idx] &= ~t->type_reg_mask; + buf[0 ][idx] |=BD72720_GPIO_IRQ_TYPE_BOTH ; + +return 0 ; + } + +return regmap_irq_set_type_config_simple (buf, type, irq_data, idx, irq_drv_data); +} +static const struct regmap_irq_chip bd71828_irq_chip = { .name ="bd71828_irq" , .main_status =BD71828_REG_INT_MAIN ,
drivers/mfd/rohm-bd71828.c static const struct regmap_irq_chip bd71815_irq_chip = { · line 827
Quoted 4 lines
drivers/mfd/rohm-bd71828.c +1
-0@@ -437,6 +824,28 @@ static const struct regmap_irq_chip bd71815_irq_chip = { .irq_reg_stride = 1, }; +static const unsigned int bd72720_irq_type_base[] = {BD72720_REG_GPIO1_CTRL };
I believe this should be: { BD72720_REG_GPIO1_CTRL };
Quoted 28 lines
drivers/mfd/rohm-bd71828.c +21
-0+ +static const struct regmap_irq_chip bd72720_irq_chip = { + .name ="bd72720_irq" , + .main_status =BD72720_REG_INT_LVL1_STAT , + .irqs = &bd72720_irqs[0 ], + .num_irqs =ARRAY_SIZE (bd72720_irqs), + .status_base =BD72720_REG_INT_PS1_STAT , + .unmask_base =BD72720_REG_INT_PS1_EN , + .config_base = &bd72720_irq_type_base[0 ], + .num_config_bases =1 , + .num_config_regs =2 , + .set_type_config = bd72720_set_type_config, + .ack_base =BD72720_REG_INT_PS1_STAT , + .init_ack_masked = true, + .num_regs =12 , + .num_main_regs =1 , + .sub_reg_offsets = &bd72720_sub_irq_offsets[0 ], + .num_main_status_bits =8 , + .irq_reg_stride =1 , +}; +static int set_clk_mode (struct device *dev,struct regmap *regmap,int clkmode_reg) {@@ -483,11 +892,40 @@ static void bd71828_remove_poweroff(void *data) pm_power_off =NULL ; }
drivers/mfd/rohm-bd71828.c static void bd71828_remove_poweroff(void *data) · line 904
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +10
-0+static struct regmap *bd72720_do_regmaps (struct i2c_client *i2c) +{ +struct bd72720_regmaps *maps; +struct i2c_client *secondary_i2c; + + secondary_i2c =devm_i2c_new_dummy_device (&i2c->dev, i2c->adapter, +BD72720_SECONDARY_I2C_SLAVE ); +if (IS_ERR (secondary_i2c)) { +dev_err_probe (&i2c->dev,PTR_ERR (secondary_i2c), +"Failed to get secondary I2C\n" );
You an use up to 100-char if it helps make things more readable.
drivers/mfd/rohm-bd71828.c static void bd71828_remove_poweroff(void *data) · line 906
Quoted 1 line
drivers/mfd/rohm-bd71828.c +1
-0+return (struct regmap *)secondary_i2c;
*shudders* -- that's a hack, right!
/me does some grepping around ...
Shouldn't this be:
return ERR_CAST(secondary_i2c);
Quoted 60 lines
drivers/mfd/rohm-bd71828.c +36
-1+ } + + maps =devm_kzalloc (&i2c->dev,sizeof (*maps),GFP_KERNEL ); +if (!maps) +return ERR_PTR (-ENOMEM ); + + maps->map1_4b =devm_regmap_init_i2c (i2c, &bd72720_regmap_4b); +if (IS_ERR (maps->map1_4b)) +return maps->map1_4b; + + maps->map2_4c =devm_regmap_init_i2c (secondary_i2c, &bd72720_regmap_4c); +if (IS_ERR (maps->map2_4c)) +return maps->map2_4c; + +return devm_regmap_init (&i2c->dev,NULL , maps, &bd72720_wrapper_map_config); +} +static int bd71828_i2c_probe (struct i2c_client *i2c) {struct regmap_irq_chip_data *irq_data;int ret; -struct regmap *regmap; +struct regmap *regmap =NULL ;const struct regmap_config *regmap_config;const struct regmap_irq_chip *irqchip;unsigned int chip_type;@@ -495,6 +933,7 @@ static int bd71828_i2c_probe(struct i2c_client *i2c)int cells;int button_irq;int clkmode_reg; +int main_lvl_mask_reg =0 , main_lvl_val =0 ;if (!i2c->irq) {dev_err (&i2c->dev,"No IRQ configured\n" );@@ -526,16 +965,34 @@ static int bd71828_i2c_probe(struct i2c_client *i2c)*/ button_irq =0 ;break ; +case ROHM_CHIP_TYPE_BD72720 : + { + mfd = bd72720_mfd_cells; + cells =ARRAY_SIZE (bd72720_mfd_cells); + + regmap =bd72720_do_regmaps (i2c); +if (IS_ERR (regmap)) +return dev_err_probe (&i2c->dev,PTR_ERR (regmap), +"Failed to initialize Regmap\n" ); + + irqchip = &bd72720_irq_chip; + clkmode_reg =BD72720_REG_OUT32K ; + button_irq =BD72720_INT_SHORTPUSH ; + main_lvl_mask_reg =BD72720_REG_INT_LVL1_EN ; + main_lvl_val =BD72720_MASK_LVL1_EN_ALL ; +break ; + }default :dev_err (&i2c->dev,"Unknown device type" );return -EINVAL ; }
drivers/mfd/rohm-bd71828.c static int bd71828_i2c_probe(struct i2c_client *i2c) · line 995
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +5
-4- regmap =devm_regmap_init_i2c (i2c, regmap_config); -if (IS_ERR (regmap)) -return dev_err_probe (&i2c->dev,PTR_ERR (regmap), +if (!regmap) { + regmap =devm_regmap_init_i2c (i2c, regmap_config); +if (IS_ERR (regmap)) +return dev_err_probe (&i2c->dev,PTR_ERR (regmap),"Failed to initialize Regmap\n" ); - + }
'\n'
Quoted 40 lines
drivers/mfd/rohm-bd71828.c +17
-0ret =devm_regmap_add_irq_chip (&i2c->dev, regmap, i2c->irq,IRQF_ONESHOT ,0 , irqchip, &irq_data);if (ret)@@ -545,6 +1002,20 @@ static int bd71828_i2c_probe(struct i2c_client *i2c)dev_dbg (&i2c->dev,"Registered %d IRQs for chip\n" , irqchip->num_irqs); +/* +* On some ICs the main IRQ register has corresponding mask register. +* This is not handled by the regmap IRQ. Let's enable all the main +* level IRQs here. Further writes to the main level MASK is not +* needed because masking is handled by the per IRQ 2.nd level MASK +* registers. 2.nd level masks are handled by the regmap IRQ. +*/ +if (main_lvl_mask_reg) { + ret =regmap_write (regmap, main_lvl_mask_reg, main_lvl_val); +if (ret) { +return dev_err_probe (&i2c->dev, ret, +"Failed to enable main level IRQs\n" ); + } + }if (button_irq) { ret =regmap_irq_get_virq (irq_data, button_irq);if (ret <0 )@@ -586,6 +1057,9 @@ static const struct of_device_id bd71828_of_match[] = { }, { .compatible = "rohm,bd71815", .data = (void *)ROHM_CHIP_TYPE_BD71815, + }, { + .compatible = "rohm,bd72720", + .data = (void *)ROHM_CHIP_TYPE_BD72720, }, { }, };include/linux/mfd/rohm-bd72720.h new file +0
-0
include/linux/mfd/rohm-bd72720.h line 3
Quoted 3 lines
include/linux/mfd/rohm-bd72720.h new file +3
-0@@ -0,0 +1,634 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright 2024 ROHM Semiconductors.
Still out of date.
Quoted 102 lines
include/linux/mfd/rohm-bd72720.h new file +102
-0+* Author: Matti Vaittinen <[email protected]> +*/ + +#ifndef _MFD_BD72720_H +#define _MFD_BD72720_H + +#include <linux/regmap.h> + +enum { +BD72720_BUCK1 , +BD72720_BUCK2 , +BD72720_BUCK3 , +BD72720_BUCK4 , +BD72720_BUCK5 , +BD72720_BUCK6 , +BD72720_BUCK7 , +BD72720_BUCK8 , +BD72720_BUCK9 , +BD72720_BUCK10 , +BD72720_BUCK11 , +BD72720_LDO1 , +BD72720_LDO2 , +BD72720_LDO3 , +BD72720_LDO4 , +BD72720_LDO5 , +BD72720_LDO6 , +BD72720_LDO7 , +BD72720_LDO8 , +BD72720_LDO9 , +BD72720_LDO10 , +BD72720_LDO11 , +BD72720_REGULATOR_AMOUNT , +}; + +/* BD72720 interrupts */ +#define BD72720_INT_LONGPUSH_MASK BIT(0) +#define BD72720_INT_MIDPUSH_MASK BIT(1) +#define BD72720_INT_SHORTPUSH_MASK BIT(2) +#define BD72720_INT_PUSH_MASK BIT(3) +#define BD72720_INT_HALL_DET_MASK BIT(4) +#define BD72720_INT_HALL_TGL_MASK BIT(5) +#define BD72720_INT_WDOG_MASK BIT(6) +#define BD72720_INT_SWRESET_MASK BIT(7) +#define BD72720_INT_SEQ_DONE_MASK BIT(0) +#define BD72720_INT_PGFAULT_MASK BIT(4) +#define BD72720_INT_BUCK1_DVS_MASK BIT(0) +#define BD72720_INT_BUCK2_DVS_MASK BIT(1) +#define BD72720_INT_BUCK3_DVS_MASK BIT(2) +#define BD72720_INT_BUCK4_DVS_MASK BIT(3) +#define BD72720_INT_BUCK5_DVS_MASK BIT(4) +#define BD72720_INT_BUCK6_DVS_MASK BIT(5) +#define BD72720_INT_BUCK7_DVS_MASK BIT(6) +#define BD72720_INT_BUCK8_DVS_MASK BIT(7) +#define BD72720_INT_BUCK9_DVS_MASK BIT(0) +#define BD72720_INT_BUCK10_DVS_MASK BIT(1) +#define BD72720_INT_LDO1_DVS_MASK BIT(4) +#define BD72720_INT_LDO2_DVS_MASK BIT(5) +#define BD72720_INT_LDO3_DVS_MASK BIT(6) +#define BD72720_INT_LDO4_DVS_MASK BIT(7) +#define BD72720_INT_VBUS_RMV_MASK BIT(0) +#define BD72720_INT_VBUS_DET_MASK BIT(1) +#define BD72720_INT_VBUS_MON_RES_MASK BIT(2) +#define BD72720_INT_VBUS_MON_DET_MASK BIT(3) +#define BD72720_INT_VSYS_MON_RES_MASK BIT(0) +#define BD72720_INT_VSYS_MON_DET_MASK BIT(1) +#define BD72720_INT_VSYS_UV_RES_MASK BIT(2) +#define BD72720_INT_VSYS_UV_DET_MASK BIT(3) +#define BD72720_INT_VSYS_LO_RES_MASK BIT(4) +#define BD72720_INT_VSYS_LO_DET_MASK BIT(5) +#define BD72720_INT_VSYS_OV_RES_MASK BIT(6) +#define BD72720_INT_VSYS_OV_DET_MASK BIT(7) +#define BD72720_INT_BAT_ILIM_MASK BIT(0) +#define BD72720_INT_CHG_DONE_MASK BIT(1) +#define BD72720_INT_EXTEMP_TOUT_MASK BIT(2) +#define BD72720_INT_CHG_WDT_EXP_MASK BIT(3) +#define BD72720_INT_BAT_MNT_OUT_MASK BIT(4) +#define BD72720_INT_BAT_MNT_IN_MASK BIT(5) +#define BD72720_INT_CHG_TRNS_MASK BIT(7) +#define BD72720_INT_VBAT_MON_RES_MASK BIT(0) +#define BD72720_INT_VBAT_MON_DET_MASK BIT(1) +#define BD72720_INT_VBAT_SHT_RES_MASK BIT(2) +#define BD72720_INT_VBAT_SHT_DET_MASK BIT(3) +#define BD72720_INT_VBAT_LO_RES_MASK BIT(4) +#define BD72720_INT_VBAT_LO_DET_MASK BIT(5) +#define BD72720_INT_VBAT_OV_RES_MASK BIT(6) +#define BD72720_INT_VBAT_OV_DET_MASK BIT(7) +#define BD72720_INT_BAT_RMV_MASK BIT(0) +#define BD72720_INT_BAT_DET_MASK BIT(1) +#define BD72720_INT_DBAT_DET_MASK BIT(2) +#define BD72720_INT_BAT_TEMP_TRNS_MASK BIT(3) +#define BD72720_INT_LOBTMP_RES_MASK BIT(4) +#define BD72720_INT_LOBTMP_DET_MASK BIT(5) +#define BD72720_INT_OVBTMP_RES_MASK BIT(6) +#define BD72720_INT_OVBTMP_DET_MASK BIT(7) +#define BD72720_INT_OCUR1_RES_MASK BIT(0) +#define BD72720_INT_OCUR1_DET_MASK BIT(1) +#define BD72720_INT_OCUR2_RES_MASK BIT(2) +#define BD72720_INT_OCUR2_DET_MASK BIT(3) +#define BD72720_INT_OCUR3_RES_MASK BIT(4) +#define BD72720_INT_OCUR3_DET_MASK BIT(5) +#define BD72720_INT_CC_MON1_DET_MASK BIT(0) +#define BD72720_INT_CC_MON2_DET_MASK BIT(1)
include/linux/mfd/rohm-bd72720.h line 116
Quoted 10 lines
include/linux/mfd/rohm-bd72720.h new file +10
-0+#define BD72720_INT_CC_MON3_DET_MASK BIT(2) +#define BD72720_INT_GPIO1_IN_MASK BIT(4) +#define BD72720_INT_GPIO2_IN_MASK BIT(5) +#define BD72720_INT_VF125_RES_MASK BIT(0) +#define BD72720_INT_VF125_DET_MASK BIT(1) +#define BD72720_INT_VF_RES_MASK BIT(2) +#define BD72720_INT_VF_DET_MASK BIT(3) +#define BD72720_INT_RTC0_MASK BIT(4) +#define BD72720_INT_RTC1_MASK BIT(5) +#define BD72720_INT_RTC2_MASK BIT(6)
I'd be able to sleep better if these all lined up.
Quoted 533 lines
include/linux/mfd/rohm-bd72720.h new file +518
-0+ +enum { +/* +* The IRQs excluding GPIO1 and GPIO2 are ordered in a same way as the +* respective IRQ bits in status and mask registers are ordered. +* +* The BD72720_INT_GPIO1_IN and BD72720_INT_GPIO2_IN are IRQs which can +* be used by other devices. Let's have GPIO1 and GPIO2 as first IRQs +* here so we can use the regmap-IRQ with standard device tree xlate +* while devices connected to the BD72720 IRQ input pins can refer to +* the first two interrupt numbers in their device tree. If we placed +* BD72720_INT_GPIO1_IN and BD72720_INT_GPIO2_IN after the CC_MON_DET +* interrupts (like they are in the registers), the devices using +* BD72720 as an IRQ parent should refer the interrupts starting with +* an offset which might not be trivial to understand. +*/ +BD72720_INT_GPIO1_IN , +BD72720_INT_GPIO2_IN , +BD72720_INT_LONGPUSH , +BD72720_INT_MIDPUSH , +BD72720_INT_SHORTPUSH , +BD72720_INT_PUSH , +BD72720_INT_HALL_DET , +BD72720_INT_HALL_TGL , +BD72720_INT_WDOG , +BD72720_INT_SWRESET , +BD72720_INT_SEQ_DONE , +BD72720_INT_PGFAULT , +BD72720_INT_BUCK1_DVS , +BD72720_INT_BUCK2_DVS , +BD72720_INT_BUCK3_DVS , +BD72720_INT_BUCK4_DVS , +BD72720_INT_BUCK5_DVS , +BD72720_INT_BUCK6_DVS , +BD72720_INT_BUCK7_DVS , +BD72720_INT_BUCK8_DVS , +BD72720_INT_BUCK9_DVS , +BD72720_INT_BUCK10_DVS , +BD72720_INT_LDO1_DVS , +BD72720_INT_LDO2_DVS , +BD72720_INT_LDO3_DVS , +BD72720_INT_LDO4_DVS , +BD72720_INT_VBUS_RMV , +BD72720_INT_VBUS_DET , +BD72720_INT_VBUS_MON_RES , +BD72720_INT_VBUS_MON_DET , +BD72720_INT_VSYS_MON_RES , +BD72720_INT_VSYS_MON_DET , +BD72720_INT_VSYS_UV_RES , +BD72720_INT_VSYS_UV_DET , +BD72720_INT_VSYS_LO_RES , +BD72720_INT_VSYS_LO_DET , +BD72720_INT_VSYS_OV_RES , +BD72720_INT_VSYS_OV_DET , +BD72720_INT_BAT_ILIM , +BD72720_INT_CHG_DONE , +BD72720_INT_EXTEMP_TOUT , +BD72720_INT_CHG_WDT_EXP , +BD72720_INT_BAT_MNT_OUT , +BD72720_INT_BAT_MNT_IN , +BD72720_INT_CHG_TRNS , +BD72720_INT_VBAT_MON_RES , +BD72720_INT_VBAT_MON_DET , +BD72720_INT_VBAT_SHT_RES , +BD72720_INT_VBAT_SHT_DET , +BD72720_INT_VBAT_LO_RES , +BD72720_INT_VBAT_LO_DET , +BD72720_INT_VBAT_OV_RES , +BD72720_INT_VBAT_OV_DET , +BD72720_INT_BAT_RMV , +BD72720_INT_BAT_DET , +BD72720_INT_DBAT_DET , +BD72720_INT_BAT_TEMP_TRNS , +BD72720_INT_LOBTMP_RES , +BD72720_INT_LOBTMP_DET , +BD72720_INT_OVBTMP_RES , +BD72720_INT_OVBTMP_DET , +BD72720_INT_OCUR1_RES , +BD72720_INT_OCUR1_DET , +BD72720_INT_OCUR2_RES , +BD72720_INT_OCUR2_DET , +BD72720_INT_OCUR3_RES , +BD72720_INT_OCUR3_DET , +BD72720_INT_CC_MON1_DET , +BD72720_INT_CC_MON2_DET , +BD72720_INT_CC_MON3_DET , +BD72720_INT_VF125_RES , +BD72720_INT_VF125_DET , +BD72720_INT_VF_RES , +BD72720_INT_VF_DET , +BD72720_INT_RTC0 , +BD72720_INT_RTC1 , +BD72720_INT_RTC2 , +}; + +/* +* BD72720 Registers: +* The BD72720 has two sets of registers behind two different I2C slave +* addresses. "Common" registers being behind 0x4b, the charger registers +* being behind 0x4c. +*/ +/* Registers behind I2C slave 0x4b */ +enum { +BD72720_REG_PRODUCT_ID , +BD72720_REG_MANUFACTURER_ID , +BD72720_REG_PMIC_REV_NUM , +BD72720_REG_NVM_REV_NUM , +BD72720_REG_BOOTSRC =0x10 , +BD72720_REG_RESETSRC_1 , +BD72720_REG_RESETSRC_2 , +BD72720_REG_RESETSRC_3 , +BD72720_REG_RESETSRC_4 , +BD72720_REG_RESETSRC_5 , +BD72720_REG_RESETSRC_6 , +BD72720_REG_RESETSRC_7 , +BD72720_REG_POWER_STATE , +BD72720_REG_PS_CFG , +BD72720_REG_PS_CTRL_1 , +BD72720_REG_PS_CTRL_2 , +BD72720_REG_RCVCFG , +BD72720_REG_RCVNUM , +BD72720_REG_CRDCFG , +BD72720_REG_REX_CTRL , + +BD72720_REG_BUCK1_ON , +BD72720_REG_BUCK1_MODE , +/* Deep idle vsel */ +BD72720_REG_BUCK1_VSEL_DI , +/* Idle vsel */ +BD72720_REG_BUCK1_VSEL_I , +/* Suspend vsel */ +BD72720_REG_BUCK1_VSEL_S , +/* Run boot vsel */ +BD72720_REG_BUCK1_VSEL_RB , +/* Run0 ... run3 vsel */ +BD72720_REG_BUCK1_VSEL_RB0 , +BD72720_REG_BUCK1_VSEL_RB1 , +BD72720_REG_BUCK1_VSEL_RB2 , +BD72720_REG_BUCK1_VSEL_RB3 , + +BD72720_REG_BUCK2_ON , +BD72720_REG_BUCK2_MODE , +BD72720_REG_BUCK2_VSEL_DI , +BD72720_REG_BUCK2_VSEL_I , +BD72720_REG_BUCK2_VSEL_S , +/* Run vsel */ +BD72720_REG_BUCK2_VSEL_R , + +BD72720_REG_BUCK3_ON , +BD72720_REG_BUCK3_MODE , +BD72720_REG_BUCK3_VSEL_DI , +BD72720_REG_BUCK3_VSEL_I , +BD72720_REG_BUCK3_VSEL_S , +BD72720_REG_BUCK3_VSEL_R , + +BD72720_REG_BUCK4_ON , +BD72720_REG_BUCK4_MODE , +BD72720_REG_BUCK4_VSEL_DI , +BD72720_REG_BUCK4_VSEL_I , +BD72720_REG_BUCK4_VSEL_S , +BD72720_REG_BUCK4_VSEL_R , + +BD72720_REG_BUCK5_ON , +BD72720_REG_BUCK5_MODE , +BD72720_REG_BUCK5_VSEL , + +BD72720_REG_BUCK6_ON , +BD72720_REG_BUCK6_MODE , +BD72720_REG_BUCK6_VSEL , + +BD72720_REG_BUCK7_ON , +BD72720_REG_BUCK7_MODE , +BD72720_REG_BUCK7_VSEL , + +BD72720_REG_BUCK8_ON , +BD72720_REG_BUCK8_MODE , +BD72720_REG_BUCK8_VSEL , + +BD72720_REG_BUCK9_ON , +BD72720_REG_BUCK9_MODE , +BD72720_REG_BUCK9_VSEL , + +BD72720_REG_BUCK10_ON , +BD72720_REG_BUCK10_MODE , +BD72720_REG_BUCK10_VSEL , + +BD72720_REG_LDO1_ON , +BD72720_REG_LDO1_MODE1 , +BD72720_REG_LDO1_MODE2 , +BD72720_REG_LDO1_VSEL_DI , +BD72720_REG_LDO1_VSEL_I , +BD72720_REG_LDO1_VSEL_S , +BD72720_REG_LDO1_VSEL_RB , +BD72720_REG_LDO1_VSEL_R0 , +BD72720_REG_LDO1_VSEL_R1 , +BD72720_REG_LDO1_VSEL_R2 , +BD72720_REG_LDO1_VSEL_R3 , + +BD72720_REG_LDO2_ON , +BD72720_REG_LDO2_MODE , +BD72720_REG_LDO2_VSEL_DI , +BD72720_REG_LDO2_VSEL_I , +BD72720_REG_LDO2_VSEL_S , +BD72720_REG_LDO2_VSEL_R , + +BD72720_REG_LDO3_ON , +BD72720_REG_LDO3_MODE , +BD72720_REG_LDO3_VSEL_DI , +BD72720_REG_LDO3_VSEL_I , +BD72720_REG_LDO3_VSEL_S , +BD72720_REG_LDO3_VSEL_R , + +BD72720_REG_LDO4_ON , +BD72720_REG_LDO4_MODE , +BD72720_REG_LDO4_VSEL_DI , +BD72720_REG_LDO4_VSEL_I , +BD72720_REG_LDO4_VSEL_S , +BD72720_REG_LDO4_VSEL_R , + +BD72720_REG_LDO5_ON , +BD72720_REG_LDO5_MODE , +BD72720_REG_LDO5_VSEL , + +BD72720_REG_LDO6_ON , +BD72720_REG_LDO6_MODE , +BD72720_REG_LDO6_VSEL , + +BD72720_REG_LDO7_ON , +BD72720_REG_LDO7_MODE , +BD72720_REG_LDO7_VSEL , + +BD72720_REG_LDO8_ON , +BD72720_REG_LDO8_MODE , +BD72720_REG_LDO8_VSEL , + +BD72720_REG_LDO9_ON , +BD72720_REG_LDO9_MODE , +BD72720_REG_LDO9_VSEL , + +BD72720_REG_LDO10_ON , +BD72720_REG_LDO10_MODE , +BD72720_REG_LDO10_VSEL , + +BD72720_REG_LDO11_ON , +BD72720_REG_LDO11_MODE , +BD72720_REG_LDO11_VSEL , + +BD72720_REG_GPIO1_ON =0x8b , +BD72720_REG_GPIO2_ON , +BD72720_REG_GPIO3_ON , +BD72720_REG_GPIO4_ON , +BD72720_REG_GPIO5_ON , + +BD72720_REG_GPIO1_CTRL , +BD72720_REG_GPIO2_CTRL , +#define BD72720_GPIO_IRQ_TYPE_MASK GENMASK(6, 4) +#define BD72720_GPIO_IRQ_TYPE_FALLING 0x0 +#define BD72720_GPIO_IRQ_TYPE_RISING 0x1 +#define BD72720_GPIO_IRQ_TYPE_BOTH 0x2 +#define BD72720_GPIO_IRQ_TYPE_HIGH 0x3 +#define BD72720_GPIO_IRQ_TYPE_LOW 0x4 +BD72720_REG_GPIO3_CTRL , +BD72720_REG_GPIO4_CTRL , +BD72720_REG_GPIO5_CTRL , +#define BD72720_GPIO_DRIVE_MASK BIT(1) +#define BD72720_GPIO_HIGH BIT(0) + +BD72720_REG_EPDEN_CTRL , +BD72720_REG_GATECNT_CTRL , +BD72720_REG_LED_CTRL , + +BD72720_REG_PWRON_CFG1 , +BD72720_REG_PWRON_CFG2 , + +BD72720_REG_OUT32K , +BD72720_REG_CONF , +BD72720_REG_HALL_STAT , + +BD72720_REG_RTC_SEC =0xa0 , +#define BD72720_REG_RTC_START BD72720_REG_RTC_SEC + BD72720_REG_RTC_MIN, +BD72720_REG_RTC_HOUR , +BD72720_REG_RTC_WEEK , +BD72720_REG_RTC_DAY , +BD72720_REG_RTC_MON , +BD72720_REG_RTC_YEAR , + +BD72720_REG_RTC_ALM0_SEC , +#define BD72720_REG_RTC_ALM_START BD72720_REG_RTC_ALM0_SEC + BD72720_REG_RTC_ALM0_MIN, +BD72720_REG_RTC_ALM0_HOUR , +BD72720_REG_RTC_ALM0_WEEK , +BD72720_REG_RTC_ALM0_MON , +BD72720_REG_RTC_ALM0_YEAR , + +BD72720_REG_RTC_ALM1_SEC , +BD72720_REG_RTC_ALM1_MIN , +BD72720_REG_RTC_ALM1_HOUR , +BD72720_REG_RTC_ALM1_WEEK , +BD72720_REG_RTC_ALM1_MON , +BD72720_REG_RTC_ALM1_YEAR , + +BD72720_REG_RTC_ALM0_EN , +BD72720_REG_RTC_ALM1_EN , +BD72720_REG_RTC_ALM2 , + +BD72720_REG_INT_LVL1_EN =0xc0 , +#define BD72720_MASK_LVL1_EN_ALL GENMASK(7, 0) + BD72720_REG_INT_PS1_EN, +BD72720_REG_INT_PS2_EN , +BD72720_REG_INT_DVS1_EN , +BD72720_REG_INT_DVS2_EN , +BD72720_REG_INT_VBUS_EN , +BD72720_REG_INT_VSYS_EN , +BD72720_REG_INT_CHG_EN , +BD72720_REG_INT_BAT1_EN , +BD72720_REG_INT_BAT2_EN , +BD72720_REG_INT_IBAT_EN , +BD72720_REG_INT_ETC1_EN , +BD72720_REG_INT_ETC2_EN , + +/* +* The _STAT registers inform IRQ line state, and are used to ack IRQ. +* The _SRC registers below indicate current state of the function +* connected to the line. +*/ +BD72720_REG_INT_LVL1_STAT , +BD72720_REG_INT_PS1_STAT , +BD72720_REG_INT_PS2_STAT , +BD72720_REG_INT_DVS1_STAT , +BD72720_REG_INT_DVS2_STAT , +BD72720_REG_INT_VBUS_STAT , +BD72720_REG_INT_VSYS_STAT , +BD72720_REG_INT_CHG_STAT , +BD72720_REG_INT_BAT1_STAT , +BD72720_REG_INT_BAT2_STAT , +BD72720_REG_INT_IBAT_STAT , +BD72720_REG_INT_ETC1_STAT , +BD72720_REG_INT_ETC2_STAT , + +BD72720_REG_INT_LVL1_SRC , +BD72720_REG_INT_PS1_SRC , +BD72720_REG_INT_PS2_SRC , +BD72720_REG_INT_DVS1_SRC , +BD72720_REG_INT_DVS2_SRC , +BD72720_REG_INT_VBUS_SRC , +#define BD72720_MASK_DCIN_DET BIT(1) + BD72720_REG_INT_VSYS_SRC, +BD72720_REG_INT_CHG_SRC , +BD72720_REG_INT_BAT1_SRC , +BD72720_REG_INT_BAT2_SRC , +BD72720_REG_INT_IBAT_SRC , +BD72720_REG_INT_ETC1_SRC , +BD72720_REG_INT_ETC2_SRC , +}; + +/* Register masks */ +#define BD72720_MASK_DEEP_IDLE_EN BIT(0) +#define BD72720_MASK_IDLE_EN BIT(1) +#define BD72720_MASK_SUSPEND_EN BIT(2) +#define BD72720_MASK_RUN_B_EN BIT(3) +#define BD72720_MASK_RUN_0_EN BIT(4) +#define BD72720_MASK_RUN_1_EN BIT(5) +#define BD72720_MASK_RUN_2_EN BIT(6) +#define BD72720_MASK_RUN_3_EN BIT(7) + +#define BD72720_MASK_RAMP_UP_DELAY GENMASK(7, 6) +#define BD72720_MASK_BUCK_VSEL GENMASK(7, 0) +#define BD72720_MASK_LDO12346_VSEL GENMASK(6, 0) +#define BD72720_MASK_LDO_VSEL GENMASK(7, 0) + +#define BD72720_I2C4C_ADDR_OFFSET 0x100 + +/* Registers behind I2C slave 0x4c */ +enum { +BD72720_REG_CHG_STATE =BD72720_I2C4C_ADDR_OFFSET , +BD72720_REG_CHG_LAST_STATE , +BD72720_REG_CHG_VBUS_STAT , +BD72720_REG_CHG_VSYS_STAT , +BD72720_REG_CHG_BAT_TEMP_STAT , +BD72720_REG_CHG_WDT_STAT , +BD72720_REG_CHG_ILIM_STAT , +BD72720_REG_CHG_CHG_STAT , +BD72720_REG_CHG_EN , +BD72720_REG_CHG_INIT , +BD72720_REG_CHG_CTRL , +BD72720_REG_CHG_SET_1 , +BD72720_REG_CHG_SET_2 , +BD72720_REG_CHG_SET_3 , +BD72720_REG_CHG_VPRE , +BD72720_REG_CHG_VBAT_1 , +BD72720_REG_CHG_VBAT_2 , +BD72720_REG_CHG_VBAT_3 , +BD72720_REG_CHG_VBAT_4 , +BD72720_REG_CHG_BAT_SET_1 , +BD72720_REG_CHG_BAT_SET_2 , +BD72720_REG_CHG_BAT_SET_3 , +BD72720_REG_CHG_IPRE , +BD72720_REG_CHG_IFST_TERM , +BD72720_REG_CHG_VSYS_REG , +BD72720_REG_CHG_VBUS_SET , +BD72720_REG_CHG_WDT_PRE , +BD72720_REG_CHG_WDT_FST , +BD72720_REG_CHG_LED_CTRL , +BD72720_REG_CHG_CFG_1 , +BD72720_REG_CHG_IFST_1 , +BD72720_REG_CHG_IFST_2 , +BD72720_REG_CHG_IFST_3 , +BD72720_REG_CHG_IFST_4 , +BD72720_REG_CHG_S_CFG_1 , +BD72720_REG_CHG_S_CFG_2 , +BD72720_REG_RS_VBUS , +BD72720_REG_RS_IBUS , +BD72720_REG_RS_VSYS , +BD72720_REG_VSYS_STATE_STAT ,/* 0x27 + offset*/ + +BD72720_REG_VM_VBAT_U =BD72720_I2C4C_ADDR_OFFSET +0x30 , +BD72720_REG_VM_VBAT_L , +BD72720_REG_VM_OCV_PRE_U , +BD72720_REG_VM_OCV_PRE_L , +BD72720_REG_VM_OCV_PST_U , +BD72720_REG_VM_OCV_PST_L , +BD72720_REG_VM_OCV_PWRON_U , +BD72720_REG_VM_OCV_PWRON_L , +BD72720_REG_VM_DVBAT_IMP_U , +BD72720_REG_VM_DVBAT_IMP_L , +BD72720_REG_VM_SA_VBAT_U , +BD72720_REG_VM_SA_VBAT_L , +BD72720_REG_VM_SA_VBAT_MIN_U , +BD72720_REG_VM_SA_VBAT_MIN_L , +BD72720_REG_VM_SA_VBAT_MAX_U , +BD72720_REG_VM_SA_VBAT_MAX_L , +BD72720_REG_REX_SA_VBAT_U , +BD72720_REG_REX_SA_VBAT_L , +BD72720_REG_VM_VSYS_U , +BD72720_REG_VM_VSYS_L , +BD72720_REG_VM_SA_VSYS_U , +BD72720_REG_VM_SA_VSYS_L , +BD72720_REG_VM_SA_VSYS_MIN_U , +BD72720_REG_VM_SA_VSYS_MIN_L , +BD72720_REG_VM_SA_VSYS_MAX_U , +BD72720_REG_VM_SA_VSYS_MAX_L , +BD72720_REG_VM_SA2_VSYS_U , +BD72720_REG_VM_SA2_VSYS_L , +BD72720_REG_VM_VBUS_U , +#define BD72720_MASK_VDCIN_U GENMASK(3, 0) + BD72720_REG_VM_VBUS_L, +BD72720_REG_VM_BATID_U , +BD72720_REG_VM_BATID_L , +BD72720_REG_VM_BATID_NOLOAD_U , +BD72720_REG_VM_BATID_NOLOAD_L , +BD72720_REG_VM_BATID_OFS_U , +BD72720_REG_VM_BATID_OFS_L , +BD72720_REG_VM_VTH_U , +BD72720_REG_VM_VTH_L , +BD72720_REG_VM_VTH_CORR_U , +BD72720_REG_VM_VTH_CORR_L , +BD72720_REG_VM_BTMP_U , +BD72720_REG_VM_BTMP_L , +BD72720_REG_VM_BTMP_IMP_U , +BD72720_REG_VM_BTMP_IMP_L , +BD72720_REG_VM_VF_U , +BD72720_REG_VM_VF_L , +BD72720_REG_VM_BATID_TH_U , +BD72720_REG_VM_BATID_TH_L , +BD72720_REG_VM_BTMP_OV_THR , +BD72720_REG_VM_BTMP_OV_DUR , +BD72720_REG_VM_BTMP_LO_THR , +BD72720_REG_VM_BTMP_LO_DUR , +BD72720_REG_ALM_VBAT_TH_U , +BD72720_REG_ALM_VBAT_TH_L , +BD72720_REG_ALM_VSYS_TH , +BD72720_REG_ALM_VBUS_TH , +BD72720_REG_ALM_VF_TH , +BD72720_REG_VSYS_MAX , +BD72720_REG_VSYS_MIN , +BD72720_REG_VM_VSYS_SA_MINMAX_CTRL , +BD72720_REG_VM_SA_CFG ,/* 0x6c + offset*/ + +BD72720_REG_CC_CURCD_U =BD72720_I2C4C_ADDR_OFFSET +0x70 , +BD72720_REG_CC_CURCD_L , +BD72720_REG_CC_CURCD_IMP_U , +BD72720_REG_CC_CURCD_IMP_L , +BD72720_REG_CC_SA_CURCD_U , +BD72720_REG_CC_SA_CURCD_L , +BD72720_REG_CC_OCUR_MON , +BD72720_REG_CC_CCNTD_3 , +BD72720_REG_CC_CCNTD_2 , +BD72720_REG_CC_CCNTD_1 , +BD72720_REG_CC_CCNTD_0 , +BD72720_REG_REX_CCNTD_3 , +BD72720_REG_REX_CCNTD_2 , +BD72720_REG_REX_CCNTD_1 , +BD72720_REG_REX_CCNTD_0 , +BD72720_REG_FULL_CCNTD_3 , +BD72720_REG_FULL_CCNTD_2 , +BD72720_REG_FULL_CCNTD_1 , +BD72720_REG_FULL_CCNTD_0 , +BD72720_REG_CCNTD_CHG_3 , +BD72720_REG_CCNTD_CHG_2 , +BD72720_REG_CC_STAT , +BD72720_REG_CC_CTRL , +BD72720_REG_CC_OCUR_THR_1 , +BD72720_REG_CC_OCUR_THR_2 , +BD72720_REG_CC_OCUR_THR_3 , +BD72720_REG_REX_CURCD_TH , +BD72720_REG_CC_BATCAP1_TH_U , +BD72720_REG_CC_BATCAP1_TH_L , +BD72720_REG_CC_BATCAP2_TH_U , +BD72720_REG_CC_BATCAP2_TH_L , +BD72720_REG_CC_BATCAP3_TH_U , +BD72720_REG_CC_BATCAP3_TH_L , +BD72720_REG_CC_CCNTD_CTRL , +BD72720_REG_CC_SA_CFG ,/* 0x92 + offset*/ +BD72720_REG_IMPCHK_CTRL =BD72720_I2C4C_ADDR_OFFSET +0xa0 , +}; + +#endif /* __LINUX_MFD_BD72720_H */ include/linux/mfd/rohm-generic.h +1
-0@@ -16,6 +16,7 @@ enum rohm_chip_type {ROHM_CHIP_TYPE_BD71828 ,ROHM_CHIP_TYPE_BD71837 ,ROHM_CHIP_TYPE_BD71847 , +ROHM_CHIP_TYPE_BD72720 ,ROHM_CHIP_TYPE_BD96801 ,ROHM_CHIP_TYPE_BD96802 , ROHM_CHIP_TYPE_BD96805,Signature · 1 line
2.51.1
Signature · 1 line
Lee Jones [李琼斯]
Matti Vaittinen
maintainerRe: [PATCH v5 08/16] mfd: bd71828: Support ROHM BD72720
Quoted 32 lines · Lee Jones
Quoted 30 lines · Matti Vaittinen
From: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a power management IC which continues the BD71828 family of PMICs. Similarly to the BD71815 and BD71828, the BD72720 integrates regulators, charger, RTC, clock gate and GPIOs.
The main difference to the earlier PMICs is that the BD72720 has two different I2C slave addresses. In addition to the registers behind the 'main I2C address', most of the charger (and to some extent LED) control is done via registers behind a 'secondary I2C slave address',
0x4c.Signed-off-by Matti Vaittinen <[email protected]>---
Revision history:
v2 =>:
- no changesRFCv1 => v2: (Mostly addressed comments from Lee and Andreas)
- Use stacked regmaps to avoid platform data and the tango with multiple regmaps in the power-supply driver
- Useregmap_reg_range()
- make it clearbd72720_irq_type_baseis an array
- tab-out definitions in the bd72720 header
- minor stylingNote: This patch depends on the series: "power: supply: add charger for BD71828" by Andreas:
https://lore.kernel.org/all/[email protected]/
Quoted 10 lines
Quoted 10 lines
There are some new variants being planned. Most notably, the BD73900 should be almost identical to the BD72720 - for everything else except the charger block.
--- drivers/mfd/Kconfig | 18 +- drivers/mfd/rohm-bd71828.c | 488 +++++++++++++++++++++++- include/linux/mfd/rohm-bd72720.h | 634 +++++++++++++++++++++++++++++++ include/linux/mfd/rohm-generic.h | 1 + 4 files changed, 1126 insertions(+), 15 deletions(-)create mode 100644
include/linux/mfd/rohm-bd72720.h
// snip
Quoted 13 lines
drivers/mfd/rohm-bd71828.c line 5
Quoted 10 lines
drivers/mfd/rohm-bd71828.c +1
-1@@ -2,7 +2,7 @@// // Copyright (C) 2019 ROHM Semiconductors // -// ROHM BD71828/BD71815 PMIC driver +// ROHM BD718[15/28/79] and BD72720 PMIC driver Looks like this header format slipped in.
Quoted 2 lines
I would appreciate a follow-up patch to change it to standard C multi-line format (except the SPDX line).
Sure.
// snip
Quoted 10 lines
drivers/mfd/rohm-bd71828.c static const struct regmap_config bd71828_regmap = { · line 400
Quoted 6 lines
drivers/mfd/rohm-bd71828.c +5
-0+static int regmap_write_wrapper (void *context,unsigned int reg,unsigned int val) +{ +struct bd72720_regmaps *maps = context; + +if (reg <0x100 )Define this to something human readable please.
Some kind of PAGE or BOUNDARY. Perhaps something better.
I will use 'BD72720_SECONDARY_I2C_REG_OFFSET'. A tad long, but it's not used on a long lines.
Quoted 7 lines
drivers/mfd/rohm-bd71828.c static const struct regmap_config bd71828_regmap = { · line 406
Quoted 7 lines
drivers/mfd/rohm-bd71828.c +6
-0+return regmap_write (maps->map1_4b, reg, val); + + reg =BD72720_REG_UNWRAP (reg); + +return regmap_write (maps->map2_4c, reg, val); +}
// snip
Quoted 10 lines
drivers/mfd/rohm-bd71828.c static void bd71828_remove_poweroff(void *data) · line 906
Quoted 2 lines
drivers/mfd/rohm-bd71828.c +1
-0+return (struct regmap *)secondary_i2c;*shudders* -- that's a hack, right!
/me does some grepping around ...
Shouldn't this be:
return ERR_CAST(secondary_i2c);
I didn't know about the ERR_CAST(). Thanks for going the extra mile and looking
Quoted 2 lines
drivers/mfd/rohm-bd71828.c
Quoted 2 lines
drivers/mfd/rohm-bd71828.c +1
-0+ }
//snip
Quoted 11 lines
include/linux/mfd/rohm-bd72720.h line 3
Quoted 9 lines
include/linux/mfd/rohm-bd72720.h new file +3
-0@@ -0,0 +1,634 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright 2024 ROHM Semiconductors. Still out of date.
Ah. Indeed. Thanks.
Quoted 3 lines
include/linux/mfd/rohm-bd72720.h line 7
Quoted 3 lines
include/linux/mfd/rohm-bd72720.h new file +3
-0+* Author: Matti Vaittinen <[email protected]> +*/ +
// snip
Quoted 73 lines
Quoted 73 lines
include/linux/mfd/rohm-bd72720.h new file +73
-0+ +/* BD72720 interrupts */ +#define BD72720_INT_LONGPUSH_MASK BIT(0) +#define BD72720_INT_MIDPUSH_MASK BIT(1) +#define BD72720_INT_SHORTPUSH_MASK BIT(2) +#define BD72720_INT_PUSH_MASK BIT(3) +#define BD72720_INT_HALL_DET_MASK BIT(4) +#define BD72720_INT_HALL_TGL_MASK BIT(5) +#define BD72720_INT_WDOG_MASK BIT(6) +#define BD72720_INT_SWRESET_MASK BIT(7) +#define BD72720_INT_SEQ_DONE_MASK BIT(0) +#define BD72720_INT_PGFAULT_MASK BIT(4) +#define BD72720_INT_BUCK1_DVS_MASK BIT(0) +#define BD72720_INT_BUCK2_DVS_MASK BIT(1) +#define BD72720_INT_BUCK3_DVS_MASK BIT(2) +#define BD72720_INT_BUCK4_DVS_MASK BIT(3) +#define BD72720_INT_BUCK5_DVS_MASK BIT(4) +#define BD72720_INT_BUCK6_DVS_MASK BIT(5) +#define BD72720_INT_BUCK7_DVS_MASK BIT(6) +#define BD72720_INT_BUCK8_DVS_MASK BIT(7) +#define BD72720_INT_BUCK9_DVS_MASK BIT(0) +#define BD72720_INT_BUCK10_DVS_MASK BIT(1) +#define BD72720_INT_LDO1_DVS_MASK BIT(4) +#define BD72720_INT_LDO2_DVS_MASK BIT(5) +#define BD72720_INT_LDO3_DVS_MASK BIT(6) +#define BD72720_INT_LDO4_DVS_MASK BIT(7) +#define BD72720_INT_VBUS_RMV_MASK BIT(0) +#define BD72720_INT_VBUS_DET_MASK BIT(1) +#define BD72720_INT_VBUS_MON_RES_MASK BIT(2) +#define BD72720_INT_VBUS_MON_DET_MASK BIT(3) +#define BD72720_INT_VSYS_MON_RES_MASK BIT(0) +#define BD72720_INT_VSYS_MON_DET_MASK BIT(1) +#define BD72720_INT_VSYS_UV_RES_MASK BIT(2) +#define BD72720_INT_VSYS_UV_DET_MASK BIT(3) +#define BD72720_INT_VSYS_LO_RES_MASK BIT(4) +#define BD72720_INT_VSYS_LO_DET_MASK BIT(5) +#define BD72720_INT_VSYS_OV_RES_MASK BIT(6) +#define BD72720_INT_VSYS_OV_DET_MASK BIT(7) +#define BD72720_INT_BAT_ILIM_MASK BIT(0) +#define BD72720_INT_CHG_DONE_MASK BIT(1) +#define BD72720_INT_EXTEMP_TOUT_MASK BIT(2) +#define BD72720_INT_CHG_WDT_EXP_MASK BIT(3) +#define BD72720_INT_BAT_MNT_OUT_MASK BIT(4) +#define BD72720_INT_BAT_MNT_IN_MASK BIT(5) +#define BD72720_INT_CHG_TRNS_MASK BIT(7) +#define BD72720_INT_VBAT_MON_RES_MASK BIT(0) +#define BD72720_INT_VBAT_MON_DET_MASK BIT(1) +#define BD72720_INT_VBAT_SHT_RES_MASK BIT(2) +#define BD72720_INT_VBAT_SHT_DET_MASK BIT(3) +#define BD72720_INT_VBAT_LO_RES_MASK BIT(4) +#define BD72720_INT_VBAT_LO_DET_MASK BIT(5) +#define BD72720_INT_VBAT_OV_RES_MASK BIT(6) +#define BD72720_INT_VBAT_OV_DET_MASK BIT(7) +#define BD72720_INT_BAT_RMV_MASK BIT(0) +#define BD72720_INT_BAT_DET_MASK BIT(1) +#define BD72720_INT_DBAT_DET_MASK BIT(2) +#define BD72720_INT_BAT_TEMP_TRNS_MASK BIT(3) +#define BD72720_INT_LOBTMP_RES_MASK BIT(4) +#define BD72720_INT_LOBTMP_DET_MASK BIT(5) +#define BD72720_INT_OVBTMP_RES_MASK BIT(6) +#define BD72720_INT_OVBTMP_DET_MASK BIT(7) +#define BD72720_INT_OCUR1_RES_MASK BIT(0) +#define BD72720_INT_OCUR1_DET_MASK BIT(1) +#define BD72720_INT_OCUR2_RES_MASK BIT(2) +#define BD72720_INT_OCUR2_DET_MASK BIT(3) +#define BD72720_INT_OCUR3_RES_MASK BIT(4) +#define BD72720_INT_OCUR3_DET_MASK BIT(5) +#define BD72720_INT_CC_MON1_DET_MASK BIT(0) +#define BD72720_INT_CC_MON2_DET_MASK BIT(1) +#define BD72720_INT_CC_MON3_DET_MASK BIT(2) +#define BD72720_INT_GPIO1_IN_MASK BIT(4) +#define BD72720_INT_GPIO2_IN_MASK BIT(5) +#define BD72720_INT_VF125_RES_MASK BIT(0)
Quoted 8 lines
include/linux/mfd/rohm-bd72720.h line 116
Quoted 6 lines
include/linux/mfd/rohm-bd72720.h new file +6
-0+#define BD72720_INT_VF125_DET_MASK BIT(1) +#define BD72720_INT_VF_RES_MASK BIT(2) +#define BD72720_INT_VF_DET_MASK BIT(3) +#define BD72720_INT_RTC0_MASK BIT(4) +#define BD72720_INT_RTC1_MASK BIT(5) +#define BD72720_INT_RTC2_MASK BIT(6)I'd be able to sleep better if these all lined up.
Hm. I think they are when this is applied?
Thanks for the review! I agree with all the comments I didn't comment on. I'll prepare v6 fixing these :)
Yours,
-- Matti
---
Matti Vaittinen
Linux kernel developer at ROHM Semiconductors
Oulu Finland
~~ When things go utterly wrong vim users can always type :help! ~~
PATCH v5 9/16 regulator: bd71828: rename IC specific entities
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The new ROHM BD72720 PMIC has similarities with the BD71828. It makes sense to support the regulator control for both PMICs using the same driver. It is often more clear to have the IC specific functions and globals named starting with the chip-name. So, as a preparatory step, prefix the BD71828 specific functions and globals with the bd71828.
It would be tempting to try also removing the chip ID from those functions which will be common for both PMICs. I have bad experiences on this as it tends to lead to problems when yet another IC is being supported with the same driver, and we will have some functions used for all, some for two of the three, and some for just one. At this point I used to start inventing wildcards like BD718XX or BD7272X. This approach is pretty much always failing as we tend to eventually have something like BD73900 - where all the wildcard stuff will break down.
So, my approach these days is to:
- keep the original chip-id prefix for anything that had it already (and avoid the churn).
- use same prefix for all things that are used by multiple ICs - typically the chip-ID of the first chip. This typically matches also the driver and file names.
- use specific chip-ID as a prefix for anything which is specific to just one chip.
As a preparatory step to adding the BD72720, add bd71828 prefix to all commonly usable functions and globals.
---
Revision history:
RFCv1 =>:
- No changes
No functional changes intended.
--- drivers/regulator/bd71828-regulator.c | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/regulator/bd71828-regulator.c +16 -16
@@ -28,7 +28,7 @@ struct bd71828_regulator_data {int reg_init_amnt; }; -static const struct reg_init buck1_inits[] = { +static const struct reg_init bd71828_buck1_inits[] = {/* * DVS Buck voltages can be changed by register values or via GPIO. * Use register accesses by default.
@@ -40,7 +40,7 @@ static const struct reg_init buck1_inits[] = { }, }; -static const struct reg_init buck2_inits[] = { +static const struct reg_init bd71828_buck2_inits[] = { { .reg =BD71828_REG_PS_CTRL_1 , .mask =BD71828_MASK_DVS_BUCK2_CTRL ,
@@ -48,7 +48,7 @@ static const struct reg_init buck2_inits[] = { }, }; -static const struct reg_init buck6_inits[] = { +static const struct reg_init bd71828_buck6_inits[] = { { .reg =BD71828_REG_PS_CTRL_1 , .mask =BD71828_MASK_DVS_BUCK6_CTRL ,
@@ -56,7 +56,7 @@ static const struct reg_init buck6_inits[] = { }, }; -static const struct reg_init buck7_inits[] = { +static const struct reg_init bd71828_buck7_inits[] = { { .reg =BD71828_REG_PS_CTRL_1 , .mask =BD71828_MASK_DVS_BUCK7_CTRL ,
@@ -102,9 +102,9 @@ static int buck_set_hw_dvs_levels(struct device_node *np,return rohm_regulator_set_dvs_levels (&data->dvs, np, desc, cfg->regmap); } -static int ldo6_parse_dt (struct device_node *np, -const struct regulator_desc *desc, -struct regulator_config *cfg) +static int bd71828_ldo6_parse_dt (struct device_node *np, +const struct regulator_desc *desc, +struct regulator_config *cfg) {int ret, i;uint32_t uv =0 ;
@@ -212,8 +212,8 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {*/ .lpsr_on_mask = BD71828_MASK_LPSR_EN, }, - .reg_inits = buck1_inits, - .reg_init_amnt = ARRAY_SIZE(buck1_inits), + .reg_inits = bd71828_buck1_inits, + .reg_init_amnt = ARRAY_SIZE(bd71828_buck1_inits), }, { .desc = {
@@ -253,8 +253,8 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { .lpsr_reg = BD71828_REG_BUCK2_SUSP_VOLT, .lpsr_mask = BD71828_MASK_BUCK1267_VOLT, }, - .reg_inits = buck2_inits, - .reg_init_amnt = ARRAY_SIZE(buck2_inits), + .reg_inits = bd71828_buck2_inits, + .reg_init_amnt = ARRAY_SIZE(bd71828_buck2_inits), }, { .desc = {
@@ -399,8 +399,8 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { .lpsr_reg = BD71828_REG_BUCK6_SUSP_VOLT, .lpsr_mask = BD71828_MASK_BUCK1267_VOLT, }, - .reg_inits = buck6_inits, - .reg_init_amnt = ARRAY_SIZE(buck6_inits), + .reg_inits = bd71828_buck6_inits, + .reg_init_amnt = ARRAY_SIZE(bd71828_buck6_inits), }, { .desc = {
@@ -440,8 +440,8 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { .lpsr_reg = BD71828_REG_BUCK7_SUSP_VOLT, .lpsr_mask = BD71828_MASK_BUCK1267_VOLT, }, - .reg_inits = buck7_inits, - .reg_init_amnt = ARRAY_SIZE(buck7_inits), + .reg_inits = bd71828_buck7_inits, + .reg_init_amnt = ARRAY_SIZE(bd71828_buck7_inits), }, { .desc = {
@@ -633,7 +633,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {* LDO6 only supports enable/disable for all states. * Voltage for LDO6 is fixed. */ - .of_parse_cb = ldo6_parse_dt, + .of_parse_cb = bd71828_ldo6_parse_dt, }, }, { .desc = {
Signature · 1 line
2.51.1
PATCH v5 10/16 regulator: bd71828: Support ROHM BD72720
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
ROHM BD72720 is a power management IC which integrates 10 buck and 11 LDO regulators. This PMIC has plenty of commonalities with the BD71828 and BD71879.
The BD72720 does also have similar 'run-level'-concept as the BD71828 had. It allows controlling the regulator's 'en masse', although only BUCK1 and LDO1 can utilize this in BD72720. Similar to BD71828, this 'en masse' -control is not supported by this driver.
Support the voltage and enable/disable state control for the BD72720.
---
Revision history:
v3 =>:
- No changes
v2 => v3:
- The ldon-head dt-property was changed to microvolts. Adapt the driver to that
RFCv1 => v2:
- No changes
There are some new variants planned. Most notably, the BD73900 should be similar to the BD72720 what comes to the regulator control logic.
If the run-level control is needed, there are some downstream extensions available at:
https://rohmsemiconductor.github.io/Linux-Kernel-PMIC-Drivers/BD72720/
--- drivers/regulator/Kconfig | 8 +- drivers/regulator/bd71828-regulator.c | 993 +++++++++++++++++++++++++- 2 files changed, 992 insertions(+), 9 deletions(-)
drivers/regulator/Kconfig +4 -4
@@ -241,13 +241,13 @@ config REGULATOR_BD71815 will be called bd71815-regulator. config REGULATOR_BD71828 - tristate "ROHM BD71828 Power Regulator" + tristate "ROHM BD71828, BD72720 and BD73900 Power Regulators" depends on MFD_ROHM_BD71828 select REGULATOR_ROHM help - This driver supports voltage regulators on ROHM BD71828 PMIC. - This will enable support for the software controllable buck - and LDO regulators. + This driver supports voltage regulators on ROHM BD71828, + BD71879, BD72720 and BD73900 PMICs. This will enable + support for the software controllable buck and LDO regulators. This driver can also be built as a module. If so, the module will be called bd71828-regulator.
drivers/regulator/bd71828-regulator.c +988 -5
1,069 lines not on this page · raw message
Signature · 1 line
2.51.1
PATCH v5 11/16 gpio: Support ROHM BD72720 gpios
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The ROHM BD72720 has 6 pins which may be configured as GPIOs. The GPIO1 ... GPIO5 and EPDEN pins. The configuration is done to OTP at the manufacturing, and it can't be read at runtime. The device-tree is required to tell the software which of the pins are used as GPIOs.
Keep the pin mapping static regardless the OTP. This way the user-space can always access the BASE+N for GPIO(N+1) (N = 0 to 4), and BASE + 5 for the EPDEN pin. Do this by setting always the number of GPIOs to 6, and by using the valid-mask to invalidate the pins which aren't configured as GPIOs.
First two pins can be set to be either input or output by OTP. Direction can't be changed by software. Rest of the pins can be set as outputs only. All of the pins support generating interrupts.
Support the Input/Output state getting/setting and the output mode configuration (open-drain/push-pull).
---
Revision history:
RFCv1 => :
- No changes
--- drivers/gpio/Kconfig | 9 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-bd72720.c | 281 ++++++++++++++++++++++++++++++++++++ 3 files changed, 291 insertions(+) create mode 100644 drivers/gpio/gpio-bd72720.c
drivers/gpio/Kconfig +9 -0
@@ -1319,6 +1319,15 @@ config GPIO_BD71828 This driver can also be built as a module. If so, the module will be called gpio-bd71828. +config GPIO_BD72720 + tristate "ROHM BD72720 and BD73900 PMIC GPIO support" + depends on MFD_ROHM_BD71828 + help + Support for GPIO on ROHM BD72720 and BD73900 PMICs. There are two + pins which can be configured to GPI or GPO, and three pins which can + be configured to GPO on the ROHM PMIC. The pin configuration is done + on OTP at manufacturing. + config GPIO_BD9571MWV tristate "ROHM BD9571 GPIO support" depends on MFD_BD9571MWV
drivers/gpio/Makefile +1 -0
@@ -45,6 +45,7 @@ obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o obj-$(CONFIG_GPIO_BCM_XGS_IPROC) += gpio-xgs-iproc.o obj-$(CONFIG_GPIO_BD71815) += gpio-bd71815.o obj-$(CONFIG_GPIO_BD71828) += gpio-bd71828.o +obj-$(CONFIG_GPIO_BD72720) += gpio-bd72720.o obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o obj-$(CONFIG_GPIO_BLZP1600) += gpio-blzp1600.o obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o
drivers/gpio/gpio-bd72720.c new file +281 -0
281 lines not on this page · raw message
Signature · 1 line
2.51.1
PATCH v5 12/16 clk: clk-bd718x7: Support BD72720 clk gate
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The BD72720 has similar simple clk gate as a few other ROHM PMICs.
Add support for BD72720 clk gate.
---
Revision history:
RFCv1 =>:
- No changes
--- drivers/clk/Kconfig | 4 ++-- drivers/clk/clk-bd718x7.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
drivers/clk/Kconfig +2 -2
@@ -475,8 +475,8 @@ config COMMON_CLK_BD718XX tristate "Clock driver for 32K clk gates on ROHM PMICs" depends on MFD_ROHM_BD718XX || MFD_ROHM_BD71828 help - This driver supports ROHM BD71837, BD71847, BD71850, BD71815 - and BD71828 PMICs clock gates. + This driver supports ROHM BD71837, BD71847, BD71850, BD71815, + BD71828, and BD72720 PMICs clock gates. config COMMON_CLK_FIXED_MMIO bool "Clock driver for Memory Mapped Fixed values"
drivers/clk/clk-bd718x7.c +8 -2
@@ -19,7 +19,8 @@#define BD71828_REG_OUT32K 0x4B/* BD71837 and BD71847 */ #define BD718XX_REG_OUT32K 0x2E - +/* BD72720 */ +#define BD72720_REG_OUT32K 0x9a/* * BD71837, BD71847, and BD71828 all use bit [0] to clk output control */
@@ -118,6 +119,10 @@ static int bd71837_clk_probe(struct platform_device *pdev) c->reg =BD71815_REG_OUT32K ; c->mask =CLK_OUT_EN_MASK ;break ; +case ROHM_CHIP_TYPE_BD72720 : + c->reg =BD72720_REG_OUT32K ; + c->mask =CLK_OUT_EN_MASK ; +break ;default :dev_err (&pdev->dev,"Unknown clk chip\n" );return -EINVAL ;
@@ -146,6 +151,7 @@ static const struct platform_device_id bd718x7_clk_id[] = { { "bd71847-clk", ROHM_CHIP_TYPE_BD71847 }, { "bd71828-clk", ROHM_CHIP_TYPE_BD71828 }, { "bd71815-clk", ROHM_CHIP_TYPE_BD71815 }, + { "bd72720-clk", ROHM_CHIP_TYPE_BD72720 }, { }, };MODULE_DEVICE_TABLE (platform, bd718x7_clk_id);
@@ -161,6 +167,6 @@ static struct platform_driver bd71837_clk = {module_platform_driver (bd71837_clk);MODULE_AUTHOR ("Matti Vaittinen <[email protected]>" ); -MODULE_DESCRIPTION ("BD718(15/18/28/37/47/50) and chip clk driver" ); +MODULE_DESCRIPTION ("BD718(15/18/28/37/47/50) and BD72720 chip clk driver" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:bd718xx-clk" );
Signature · 1 line
2.51.1
PATCH v5 13/16 rtc: bd70528: Support BD72720 rtc
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The BD72720 has similar RTC block as a few other ROHM PMICs.
Add support for BD72720 RTC.
---
Revision history:
RFCv1 =>:
- No changes
--- drivers/rtc/Kconfig | 3 ++- drivers/rtc/rtc-bd70528.c | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-)
drivers/rtc/Kconfig +2 -1
@@ -561,7 +561,8 @@ config RTC_DRV_BD70528 depends on MFD_ROHM_BD71828 help If you say Y here you will get support for the RTC - block on ROHM BD71815 and BD71828 Power Management IC. + block on ROHM BD71815, BD71828 and BD72720 Power + Management ICs. This driver can also be built as a module. If so, the module will be called rtc-bd70528.
drivers/rtc/rtc-bd70528.c +14 -7
@@ -7,6 +7,7 @@#include <linux/bcd.h> #include <linux/mfd/rohm-bd71815.h> #include <linux/mfd/rohm-bd71828.h> +#include <linux/mfd/rohm-bd72720.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h>
@@ -262,13 +263,13 @@ static int bd70528_probe(struct platform_device *pdev)/* * See also BD718XX_ALM_EN_OFFSET: -* This works for BD71828 and BD71815 as they have same offset -* between ALM0 start and ALM0_MASK. If new ICs are to be -* added this requires proper check as ALM0_MASK is not located -* at the end of ALM0 block - but after all ALM blocks so if -* amount of ALMs differ the offset to enable/disable is likely -* to be incorrect and enable/disable must be given as own -* reg address here. +* This works for BD71828, BD71815, and BD72720 as they all +* have same offset between the ALM0 start and the ALM0_MASK. +* If new ICs are to be added this requires proper check as +* the ALM0_MASK is not located at the end of ALM0 block - +* but after all ALM blocks. If amount of ALMs differ, the +* offset to enable/disable is likely to be incorrect and +* enable/disable must be given as own reg address here. */ bd_rtc->bd718xx_alm_block_start =BD71815_REG_RTC_ALM_START ; hour_reg =BD71815_REG_HOUR ;
@@ -278,6 +279,11 @@ static int bd70528_probe(struct platform_device *pdev) bd_rtc->bd718xx_alm_block_start =BD71828_REG_RTC_ALM_START ; hour_reg =BD71828_REG_RTC_HOUR ;break ; +case ROHM_CHIP_TYPE_BD72720 : + bd_rtc->reg_time_start =BD72720_REG_RTC_START ; + bd_rtc->bd718xx_alm_block_start =BD72720_REG_RTC_ALM_START ; + hour_reg =BD72720_REG_RTC_HOUR ; +break ;default :dev_err (&pdev->dev,"Unknown chip\n" );return -ENOENT ;
@@ -337,6 +343,7 @@ static int bd70528_probe(struct platform_device *pdev)static const struct platform_device_id bd718x7_rtc_id[] = { {"bd71828-rtc" ,ROHM_CHIP_TYPE_BD71828 }, {"bd71815-rtc" ,ROHM_CHIP_TYPE_BD71815 }, + {"bd72720-rtc" ,ROHM_CHIP_TYPE_BD72720 }, { }, };MODULE_DEVICE_TABLE (platform, bd718x7_rtc_id);
Signature · 1 line
2.51.1
PATCH v5 14/16 power: supply: bd71828: Support wider register addresses
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The BD71828 power-supply driver assumes register addresses to be 8-bit. The new BD72720 will use stacked register maps to hide paging which is done using secondary I2C slave address. This requires use of 9-bit register addresses in the power-supply driver (added offset 0x100 to the 8-bit hardware register addresses).
The cost is slightly used memory consumption as the members in the struct pwr_regs will be changed from u8 to unsigned int, which means 3 byte increase / member / instance.
This is currently 14 members (expected to possibly be increased when adding new variants / new functionality which may introduce new registers, but not expected to grow much) and 2 instances (will be 3 instances when BD72720 gets added).
So, even if the number of registers grew to 50 it'd be 150 bytes / instance. Assuming we eventually supported 5 variants, it'd be 5 * 150 bytes, which stays very reasonable considering systems we are dealing with.
As a side note, we can reduce the "wasted space / member / instance" from 3 bytes to 1 byte, by using u16 instead of the unsigned int if needed. I rather use unsigned int to be initially prepared for devices with 32 bit registers if there is no need to count bytes.
---
Revision history:
v2 => :
- No changes
RFCv1 => v2:
- New patch
--- drivers/power/supply/bd71828-power.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/power/supply/bd71828-power.c +13 -13
@@ -44,19 +44,19 @@#define VBAT_LOW_TH 0x00D4struct pwr_regs { -u8 vbat_avg; -u8 ibat; -u8 ibat_avg; -u8 btemp_vth; -u8 chg_state; -u8 bat_temp; -u8 dcin_stat; -u8 dcin_collapse_limit; -u8 chg_set1; -u8 chg_en; -u8 vbat_alm_limit_u; -u8 conf; -u8 vdcin; +unsigned int vbat_avg; +unsigned int ibat; +unsigned int ibat_avg; +unsigned int btemp_vth; +unsigned int chg_state; +unsigned int bat_temp; +unsigned int dcin_stat; +unsigned int dcin_collapse_limit; +unsigned int chg_set1; +unsigned int chg_en; +unsigned int vbat_alm_limit_u; +unsigned int conf; +unsigned int vdcin; };static const struct pwr_regs pwr_regs_bd71828 = {
Signature · 1 line
2.51.1
PATCH v5 15/16 power: supply: bd71828-power: Support ROHM BD72720
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
The ROHM BD72720 is a power management IC with a charger and coulomb counter block which is closely related to the charger / coulomb counter found from the BD71815, BD71828, BD71879 which are all supported by the bd71828-power driver. Due to the similarities it makes sense to support also the BD72720 with the same driver.
Add basic support for the charger logic on ROHM BD72720.
---
Revision history:
v2 => :
- No changes
RFCv1 => v2:
- Support using 9-bit register addresses (offset of 0x100) with the BD72720
- Simplify probe and IC data as we don't need two regmaps
- Drop two BD72720 specific functions as we no longer need different regmap for it.
Note: This patch depends on the series: "power: supply: add charger for BD71828" by Andreas:
https://lore.kernel.org/all/[email protected]/
NOTE: Fuel-gauging is not supported. You can find an unmaintained downstream reference-driver with a fuel-gauge example from:
https://github.com/RohmSemiconductor/Linux-Kernel-PMIC-Drivers/releases/tag/bd72720-reference-driver-v1
--- drivers/power/supply/bd71828-power.c | 134 +++++++++++++++++++++++---- 1 file changed, 116 insertions(+), 18 deletions(-)
drivers/power/supply/bd71828-power.c +116 -18
@@ -5,6 +5,7 @@#include <linux/kernel.h> #include <linux/mfd/rohm-bd71815.h> #include <linux/mfd/rohm-bd71828.h> +#include <linux/mfd/rohm-bd72720.h> #include <linux/module.h> #include <linux/mod_devicetable.h> #include <linux/platform_device.h>
@@ -51,12 +52,14 @@ struct pwr_regs {unsigned int chg_state;unsigned int bat_temp;unsigned int dcin_stat; +unsigned int dcin_online_mask;unsigned int dcin_collapse_limit;unsigned int chg_set1;unsigned int chg_en;unsigned int vbat_alm_limit_u;unsigned int conf;unsigned int vdcin; +unsigned int vdcin_himask; };static const struct pwr_regs pwr_regs_bd71828 = {
@@ -67,12 +70,14 @@ static const struct pwr_regs pwr_regs_bd71828 = { .chg_state = BD71828_REG_CHG_STATE, .bat_temp = BD71828_REG_BAT_TEMP, .dcin_stat = BD71828_REG_DCIN_STAT, + .dcin_online_mask = BD7182x_MASK_DCIN_DET, .dcin_collapse_limit = BD71828_REG_DCIN_CLPS, .chg_set1 = BD71828_REG_CHG_SET1, .chg_en = BD71828_REG_CHG_EN, .vbat_alm_limit_u = BD71828_REG_ALM_VBAT_LIMIT_U, .conf = BD71828_REG_CONF, .vdcin = BD71828_REG_VDCIN_U, + .vdcin_himask = BD7182x_MASK_VDCIN_U, };static const struct pwr_regs pwr_regs_bd71815 = {
@@ -85,6 +90,7 @@ static const struct pwr_regs pwr_regs_bd71815 = { .chg_state = BD71815_REG_CHG_STATE, .bat_temp = BD71815_REG_BAT_TEMP, .dcin_stat = BD71815_REG_DCIN_STAT, + .dcin_online_mask = BD7182x_MASK_DCIN_DET, .dcin_collapse_limit = BD71815_REG_DCIN_CLPS, .chg_set1 = BD71815_REG_CHG_SET1, .chg_en = BD71815_REG_CHG_SET1,
@@ -92,6 +98,31 @@ static const struct pwr_regs pwr_regs_bd71815 = { .conf = BD71815_REG_CONF, .vdcin = BD71815_REG_VM_DCIN_U, + .vdcin_himask = BD7182x_MASK_VDCIN_U, +}; + +static struct pwr_regs pwr_regs_bd72720 = { + .vbat_avg =BD72720_REG_VM_SA_VBAT_U , + .ibat =BD72720_REG_CC_CURCD_U , + .ibat_avg =BD72720_REG_CC_SA_CURCD_U , + .btemp_vth =BD72720_REG_VM_BTMP_U , +/* +* Note, state 0x40 IMP_CHK. not documented +* on other variants but was still handled in +* existing code. No memory traces as to why. +*/ + .chg_state =BD72720_REG_CHG_STATE , + .bat_temp =BD72720_REG_CHG_BAT_TEMP_STAT , + .dcin_stat =BD72720_REG_INT_VBUS_SRC , + .dcin_online_mask =BD72720_MASK_DCIN_DET , + .dcin_collapse_limit =-1 ,/* Automatic. Setting not supported */ + .chg_set1 =BD72720_REG_CHG_SET_1 , + .chg_en =BD72720_REG_CHG_EN , +/* 15mV note in data-sheet */ + .vbat_alm_limit_u =BD72720_REG_ALM_VBAT_TH_U , + .conf =BD72720_REG_CONF ,/* o XSTB, only PON. Seprate slave addr */ + .vdcin =BD72720_REG_VM_VBUS_U ,/* 10 bits not 11 as with other ICs */ + .vdcin_himask =BD72720_MASK_VDCIN_U , };struct bd71828_power {
@@ -298,7 +329,7 @@ static int get_chg_online(struct bd71828_power *pwr, int *chg_online)dev_err (pwr->dev,"Failed to read DCIN status\n" );return ret; } - *chg_online = ((r & BD7182x_MASK_DCIN_DET) !=0 ); + *chg_online = ((r & pwr->regs->dcin_online_mask) !=0 );return 0 ; }
@@ -329,8 +360,8 @@ static int bd71828_bat_inserted(struct bd71828_power *pwr) ret = val & BD7182x_MASK_CONF_PON;if (ret) -regmap_update_bits (pwr->regmap, pwr->regs->conf, - BD7182x_MASK_CONF_PON,0 ); +if (regmap_update_bits (pwr->regmap, pwr->regs->conf, BD7182x_MASK_CONF_PON,0 )) +dev_err (pwr->dev,"Failed to write CONF register\n" );return ret; }
@@ -358,11 +389,13 @@ static int bd71828_init_hardware(struct bd71828_power *pwr)int ret;/* TODO: Collapse limit should come from device-tree ? */ - ret =regmap_write (pwr->regmap, pwr->regs->dcin_collapse_limit, - BD7182x_DCIN_COLLAPSE_DEFAULT); -if (ret) { -dev_err (pwr->dev,"Failed to write DCIN collapse limit\n" ); -return ret; +if (pwr->regs->dcin_collapse_limit != (unsigned int )-1 ) { + ret =regmap_write (pwr->regmap, pwr->regs->dcin_collapse_limit, + BD7182x_DCIN_COLLAPSE_DEFAULT); +if (ret) { +dev_err (pwr->dev,"Failed to write DCIN collapse limit\n" ); +return ret; + } } ret = pwr->bat_inserted (pwr);
@@ -419,7 +452,7 @@ static int bd71828_charger_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW : ret =bd7182x_read16_himask (pwr, pwr->regs->vdcin, - BD7182x_MASK_VDCIN_U, &tmp); + pwr->regs->vdcin_himask, &tmp);if (ret)return ret;
@@ -630,6 +663,9 @@ BD_ISR_AC(dcin_ovp_det, "DCIN OVER VOLTAGE", true) BD_ISR_DUMMY(dcin_mon_det, "DCIN voltage below threshold") BD_ISR_DUMMY(dcin_mon_res, "DCIN voltage above threshold") +BD_ISR_DUMMY(vbus_curr_limit, "VBUS current limited") +BD_ISR_DUMMY(vsys_ov_res, "VSYS over-voltage cleared") +BD_ISR_DUMMY(vsys_ov_det, "VSYS over-voltage") BD_ISR_DUMMY(vsys_uv_res, "VSYS under-voltage cleared") BD_ISR_DUMMY(vsys_uv_det, "VSYS under-voltage")BD_ISR_DUMMY (vsys_low_res,"'VSYS low' cleared" )
@@ -878,6 +914,51 @@ static int bd7182x_get_irqs(struct platform_device *pdev,BDIRQ ("bd71828-temp-125-over" , bd71828_temp_vf125_det), BDIRQ("bd71828-temp-125-under", bd71828_temp_vf125_res), }; +static const struct bd7182x_irq_res bd72720_irqs[] = { +BDIRQ ("bd72720_int_vbus_rmv" ,BD_ISR_NAME (dcin_removed)), +BDIRQ ("bd72720_int_vbus_det" , bd7182x_dcin_detected), +BDIRQ ("bd72720_int_vbus_mon_res" ,BD_ISR_NAME (dcin_mon_res)), +BDIRQ ("bd72720_int_vbus_mon_det" ,BD_ISR_NAME (dcin_mon_det)), +BDIRQ ("bd72720_int_vsys_mon_res" ,BD_ISR_NAME (vsys_mon_res)), +BDIRQ ("bd72720_int_vsys_mon_det" ,BD_ISR_NAME (vsys_mon_det)), +BDIRQ ("bd72720_int_vsys_uv_res" ,BD_ISR_NAME (vsys_uv_res)), +BDIRQ ("bd72720_int_vsys_uv_det" ,BD_ISR_NAME (vsys_uv_det)), +BDIRQ ("bd72720_int_vsys_lo_res" ,BD_ISR_NAME (vsys_low_res)), +BDIRQ ("bd72720_int_vsys_lo_det" ,BD_ISR_NAME (vsys_low_det)), +BDIRQ ("bd72720_int_vsys_ov_res" ,BD_ISR_NAME (vsys_ov_res)), +BDIRQ ("bd72720_int_vsys_ov_det" ,BD_ISR_NAME (vsys_ov_det)), +BDIRQ ("bd72720_int_bat_ilim" ,BD_ISR_NAME (vbus_curr_limit)), +BDIRQ ("bd72720_int_chg_done" , bd718x7_chg_done), +BDIRQ ("bd72720_int_extemp_tout" ,BD_ISR_NAME (chg_wdg_temp)), +BDIRQ ("bd72720_int_chg_wdt_exp" ,BD_ISR_NAME (chg_wdg)), +BDIRQ ("bd72720_int_bat_mnt_out" ,BD_ISR_NAME (rechg_res)), +BDIRQ ("bd72720_int_bat_mnt_in" ,BD_ISR_NAME (rechg_det)), +BDIRQ ("bd72720_int_chg_trns" ,BD_ISR_NAME (chg_state_changed)), + +BDIRQ ("bd72720_int_vbat_mon_res" ,BD_ISR_NAME (bat_mon_res)), +BDIRQ ("bd72720_int_vbat_mon_det" ,BD_ISR_NAME (bat_mon)), +BDIRQ ("bd72720_int_vbat_sht_res" ,BD_ISR_NAME (bat_short_res)), +BDIRQ ("bd72720_int_vbat_sht_det" ,BD_ISR_NAME (bat_short)), +BDIRQ ("bd72720_int_vbat_lo_res" ,BD_ISR_NAME (bat_low_res)), +BDIRQ ("bd72720_int_vbat_lo_det" ,BD_ISR_NAME (bat_low)), +BDIRQ ("bd72720_int_vbat_ov_res" ,BD_ISR_NAME (bat_ov_res)), +BDIRQ ("bd72720_int_vbat_ov_det" ,BD_ISR_NAME (bat_ov)), +BDIRQ ("bd72720_int_bat_rmv" ,BD_ISR_NAME (bat_removed)), +BDIRQ ("bd72720_int_bat_det" ,BD_ISR_NAME (bat_det)), +BDIRQ ("bd72720_int_dbat_det" ,BD_ISR_NAME (bat_dead)), +BDIRQ ("bd72720_int_bat_temp_trns" ,BD_ISR_NAME (temp_transit)), +BDIRQ ("bd72720_int_lobtmp_res" ,BD_ISR_NAME (temp_bat_low_res)), +BDIRQ ("bd72720_int_lobtmp_det" ,BD_ISR_NAME (temp_bat_low)), +BDIRQ ("bd72720_int_ovbtmp_res" ,BD_ISR_NAME (temp_bat_hi_res)), +BDIRQ ("bd72720_int_ovbtmp_det" ,BD_ISR_NAME (temp_bat_hi)), +BDIRQ ("bd72720_int_ocur1_res" ,BD_ISR_NAME (bat_oc1_res)), +BDIRQ ("bd72720_int_ocur1_det" ,BD_ISR_NAME (bat_oc1)), +BDIRQ ("bd72720_int_ocur2_res" ,BD_ISR_NAME (bat_oc2_res)), +BDIRQ ("bd72720_int_ocur2_det" ,BD_ISR_NAME (bat_oc2)), +BDIRQ ("bd72720_int_ocur3_res" ,BD_ISR_NAME (bat_oc3_res)), +BDIRQ ("bd72720_int_ocur3_det" ,BD_ISR_NAME (bat_oc3)), +BDIRQ ("bd72720_int_cc_mon2_det" ,BD_ISR_NAME (bat_cc_mon)), + };int num_irqs;const struct bd7182x_irq_res *irqs;
@@ -890,6 +971,10 @@ static int bd7182x_get_irqs(struct platform_device *pdev, irqs = &bd71815_irqs[0 ]; num_irqs =ARRAY_SIZE (bd71815_irqs);break ; +case ROHM_CHIP_TYPE_BD72720 : + irqs = &bd72720_irqs[0 ]; + num_irqs =ARRAY_SIZE (bd72720_irqs); +break ;default :return -EINVAL ; }
@@ -958,21 +1043,27 @@ static int bd71828_power_probe(struct platform_device *pdev)struct power_supply_config ac_cfg = {};struct power_supply_config bat_cfg = {};int ret; -struct regmap *regmap; - - regmap =dev_get_regmap (pdev->dev.parent,NULL ); -if (!regmap) { -dev_err (&pdev->dev,"No parent regmap\n" ); -return -EINVAL ; - } pwr =devm_kzalloc (&pdev->dev,sizeof (*pwr),GFP_KERNEL );if (!pwr)return -ENOMEM ; - pwr->regmap = regmap; - pwr->dev = &pdev->dev; +/* +* The BD72720 MFD device registers two regmaps. Power-supply driver +* uses the "wrap-map", which provides access to both of the I2C slave +* addresses used by the BD72720 +*/ pwr->chip_type =platform_get_device_id (pdev)->driver_data; +if (pwr->chip_type !=ROHM_CHIP_TYPE_BD72720 ) + pwr->regmap =dev_get_regmap (pdev->dev.parent,NULL ); +else + pwr->regmap =dev_get_regmap (pdev->dev.parent,"wrap-map" ); +if (!pwr->regmap) { +dev_err (&pdev->dev,"No parent regmap\n" ); +return -EINVAL ; + } + + pwr->dev = &pdev->dev;switch (pwr->chip_type) {case ROHM_CHIP_TYPE_BD71828 :
@@ -985,6 +1076,12 @@ static int bd71828_power_probe(struct platform_device *pdev) pwr->get_temp = bd71815_get_temp; pwr->regs = &pwr_regs_bd71815;break ; +case ROHM_CHIP_TYPE_BD72720 : + pwr->bat_inserted = bd71828_bat_inserted; + pwr->regs = &pwr_regs_bd72720; + pwr->get_temp = bd71828_get_temp; +dev_dbg (pwr->dev,"Found ROHM BD72720\n" ); +break ;default :dev_err (pwr->dev,"Unknown PMIC\n" );return -EINVAL ;
@@ -1030,6 +1127,7 @@ static int bd71828_power_probe(struct platform_device *pdev)static const struct platform_device_id bd71828_charger_id[] = { {"bd71815-power" ,ROHM_CHIP_TYPE_BD71815 }, {"bd71828-power" ,ROHM_CHIP_TYPE_BD71828 }, + {"bd72720-power" ,ROHM_CHIP_TYPE_BD72720 }, { }, };MODULE_DEVICE_TABLE (platform, bd71828_charger_id);
Signature · 1 line
2.51.1
PATCH v5 16/16 MAINTAINERS: Add ROHM BD72720 PMIC
In reply to Matti VaittinenFrom: Matti Vaittinen <[email protected]>
Add the ROHM BD72720 PMIC driver files to be maintained by undersigned.
---
Revision history:
RFCv1 =>:
- No changes
--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -22353,6 +22353,7 @@ S: Supported F: drivers/clk/clk-bd718x7.c F: drivers/gpio/gpio-bd71815.c F: drivers/gpio/gpio-bd71828.c +F: drivers/gpio/gpio-bd72720.c F: drivers/mfd/rohm-bd71828.c F: drivers/mfd/rohm-bd718x7.c F: drivers/mfd/rohm-bd9576.c
@@ -22369,6 +22370,7 @@ F: drivers/watchdog/bd96801_wdt.c F: include/linux/mfd/rohm-bd71815.h F: include/linux/mfd/rohm-bd71828.h F: include/linux/mfd/rohm-bd718x7.h +F: include/linux/mfd/rohm-bd72720.h F: include/linux/mfd/rohm-bd957x.h F: include/linux/mfd/rohm-bd96801.h F: include/linux/mfd/rohm-bd96802.h
Signature · 1 line
2.51.1