* [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema
@ 2021-12-29 14:15 Krzysztof Kozlowski
2021-12-29 14:15 ` [PATCH 1/4] ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and Rinato Krzysztof Kozlowski
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2021-12-29 14:15 UTC (permalink / raw)
To: Lee Jones, Rob Herring, Chanwoo Choi, Krzysztof Kozlowski,
Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree,
linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc
Hi,
Dependencies:
1. DTS patch 1/4: nothing depends on it, sending here so Rob's automatic
checker won't complain about DTS.
I will take it via Samsung SoC tree.
2. Final MFD patch (4/4) depends on regulator and power, so the last
patches (2+3+4) should go via same tree.
Best regards,
Krzysztof
Krzysztof Kozlowski (4):
ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and
Rinato
dt-bindings: power: supply: maxim,max14577: convert to dtschema
regulator: dt-bindings: maxim,max14577: convert to dtschema
dt-bindings: mfd: maxim,max14577: convert to dtschema
.../devicetree/bindings/mfd/max14577.txt | 147 -------------
.../bindings/mfd/maxim,max14577.yaml | 195 ++++++++++++++++++
.../bindings/power/supply/maxim,max14577.yaml | 84 ++++++++
.../bindings/regulator/maxim,max14577.yaml | 81 ++++++++
MAINTAINERS | 3 +-
arch/arm/boot/dts/exynos3250-monk.dts | 2 +-
arch/arm/boot/dts/exynos3250-rinato.dts | 2 +-
7 files changed, 364 insertions(+), 150 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt
create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max14577.yaml
create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max14577.yaml
--
2.32.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/4] ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and Rinato 2021-12-29 14:15 [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema Krzysztof Kozlowski @ 2021-12-29 14:15 ` Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema Krzysztof Kozlowski ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Krzysztof Kozlowski @ 2021-12-29 14:15 UTC (permalink / raw) To: Lee Jones, Rob Herring, Chanwoo Choi, Krzysztof Kozlowski, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc The newly introduced dtschema for MAX77836 MUIC requires proper naming of extcon child node. This should not have actual impact on MFD children driver binding, because the max77836 MFD driver uses compatibles. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- arch/arm/boot/dts/exynos3250-monk.dts | 2 +- arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts index 8b41a9d5e2db..02a9dc479d34 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts @@ -69,7 +69,7 @@ max77836: pmic@25 { reg = <0x25>; wakeup-source; - muic: max77836-muic { + extcon { compatible = "maxim,max77836-muic"; }; diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index 5f7f8fedfb92..6d2c7bb19184 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -70,7 +70,7 @@ max77836: pmic@25 { reg = <0x25>; wakeup-source; - muic: max77836-muic { + extcon { compatible = "maxim,max77836-muic"; }; -- 2.32.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema 2021-12-29 14:15 [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 1/4] ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and Rinato Krzysztof Kozlowski @ 2021-12-29 14:15 ` Krzysztof Kozlowski 2022-01-10 19:42 ` Rob Herring 2021-12-29 14:15 ` [PATCH 3/4] regulator: dt-bindings: " Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 4/4] dt-bindings: mfd: " Krzysztof Kozlowski 3 siblings, 1 reply; 8+ messages in thread From: Krzysztof Kozlowski @ 2021-12-29 14:15 UTC (permalink / raw) To: Lee Jones, Rob Herring, Chanwoo Choi, Krzysztof Kozlowski, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc Convert the Charger bindings of Maxim MAX14577/MAX77836 MUIC to DT schema format. The existing bindings were defined in ../bindings/mfd/max14577.txt. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- .../bindings/power/supply/maxim,max14577.yaml | 84 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 85 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml new file mode 100644 index 000000000000..3978b48299de --- /dev/null +++ b/Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml @@ -0,0 +1,84 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/power/supply/maxim,max14577.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC Charger + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> + +description: | + This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB + Integrated Circuit (MUIC). + + See also Documentation/devicetree/bindings/mfd/maxim,max14577.yaml for + additional information and example. + +properties: + compatible: + enum: + - maxim,max14577-charger + - maxim,max77836-charger + + maxim,constant-uvolt: + description: + Battery Constant Voltage in uV + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 4000000 + maximum: 4350000 + + maxim,eoc-uamp: + description: | + Current in uA for End-Of-Charge mode. + MAX14577: 50000-20000 + MAX77836: 5000-100000 + $ref: /schemas/types.yaml#/definitions/uint32 + + maxim,fast-charge-uamp: + description: | + Current in uA for Fast Charge + MAX14577: 90000-950000 + MAX77836: 45000-475000 + $ref: /schemas/types.yaml#/definitions/uint32 + + maxim,ovp-uvolt: + description: + OverVoltage Protection Threshold in uV; In an overvoltage condition, INT + asserts and charging stops. + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [6000000, 6500000, 7000000, 7500000] + +required: + - compatible + - maxim,constant-uvolt + - maxim,eoc-uamp + - maxim,fast-charge-uamp + - maxim,ovp-uvolt + +allOf: + - if: + properties: + compatible: + contains: + const: maxim,max14577-charger + then: + properties: + maxim,eoc-uamp: + minimum: 50000 + maximum: 200000 + maxim,fast-charge-uamp: + minimum: 90000 + maximum: 950000 + else: + # max77836 + properties: + maxim,eoc-uamp: + minimum: 5000 + maximum: 100000 + maxim,fast-charge-uamp: + minimum: 45000 + maximum: 475000 + +additionalProperties: false diff --git a/MAINTAINERS b/MAINTAINERS index d1f8f312f322..13e21c229c5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11681,6 +11681,7 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> L: linux-pm@vger.kernel.org S: Supported +F: Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml F: Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml F: drivers/power/supply/max14577_charger.c F: drivers/power/supply/max77693_charger.c -- 2.32.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema 2021-12-29 14:15 ` [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema Krzysztof Kozlowski @ 2022-01-10 19:42 ` Rob Herring 0 siblings, 0 replies; 8+ messages in thread From: Rob Herring @ 2022-01-10 19:42 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Liam Girdwood, devicetree, Chanwoo Choi, Mark Brown, linux-kernel, linux-arm-kernel, Rob Herring, Sebastian Reichel, linux-samsung-soc, linux-pm, Lee Jones On Wed, 29 Dec 2021 15:15:22 +0100, Krzysztof Kozlowski wrote: > Convert the Charger bindings of Maxim MAX14577/MAX77836 MUIC to DT > schema format. The existing bindings were defined in > ../bindings/mfd/max14577.txt. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > --- > .../bindings/power/supply/maxim,max14577.yaml | 84 +++++++++++++++++++ > MAINTAINERS | 1 + > 2 files changed, 85 insertions(+) > create mode 100644 Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml > Reviewed-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] regulator: dt-bindings: maxim,max14577: convert to dtschema 2021-12-29 14:15 [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 1/4] ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and Rinato Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema Krzysztof Kozlowski @ 2021-12-29 14:15 ` Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 4/4] dt-bindings: mfd: " Krzysztof Kozlowski 3 siblings, 0 replies; 8+ messages in thread From: Krzysztof Kozlowski @ 2021-12-29 14:15 UTC (permalink / raw) To: Lee Jones, Rob Herring, Chanwoo Choi, Krzysztof Kozlowski, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc Convert the regulator bindings of Maxim MAX14577/MAX77835 MUIC to DT schema format. The existing bindings were defined in ../bindings/mfd/max14577.txt. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- .../bindings/regulator/maxim,max14577.yaml | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max14577.yaml diff --git a/Documentation/devicetree/bindings/regulator/maxim,max14577.yaml b/Documentation/devicetree/bindings/regulator/maxim,max14577.yaml new file mode 100644 index 000000000000..e7c2d9c948ce --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/maxim,max14577.yaml @@ -0,0 +1,81 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/maxim,max14577.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC regulators + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> + +description: | + This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB + Integrated Circuit (MUIC). + + See also Documentation/devicetree/bindings/mfd/maxim,max14577.yaml for + additional information and example. + +properties: + compatible: + enum: + - maxim,max14577-regulator + - maxim,max77836-regulator + +patternProperties: + "^SAFEOUT$": + type: object + $ref: regulator.yaml# + unevaluatedProperties: false + description: | + Safeout LDO regulator (fixed voltage). + + properties: + regulator-min-microvolt: + const: 4900000 + regulator-max-microvolt: + const: 4900000 + + required: + - regulator-name + + "^CHARGER$": + type: object + $ref: regulator.yaml# + unevaluatedProperties: false + description: | + Current regulator. + + properties: + regulator-min-microamp: true + regulator-max-microamp: true + + required: + - regulator-name + + "^LDO[12]$": + type: object + $ref: regulator.yaml# + unevaluatedProperties: false + description: | + Current regulator. + + properties: + regulator-min-microvolt: true + regulator-max-microvolt: true + + required: + - regulator-name + +allOf: + - if: + properties: + compatible: + contains: + const: maxim,max14577-regulator + then: + properties: + LDO1: false + LDO2: false + +additionalProperties: false -- 2.32.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] dt-bindings: mfd: maxim,max14577: convert to dtschema 2021-12-29 14:15 [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema Krzysztof Kozlowski ` (2 preceding siblings ...) 2021-12-29 14:15 ` [PATCH 3/4] regulator: dt-bindings: " Krzysztof Kozlowski @ 2021-12-29 14:15 ` Krzysztof Kozlowski 2022-01-10 19:44 ` Rob Herring 3 siblings, 1 reply; 8+ messages in thread From: Krzysztof Kozlowski @ 2021-12-29 14:15 UTC (permalink / raw) To: Lee Jones, Rob Herring, Chanwoo Choi, Krzysztof Kozlowski, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc Convert the MFD part of Maxim MAX14577/MAX77836 MUIC to DT schema format. The example DTS was copied from existing DTS (exynos3250-rinato.dts), so keep the license as GPL-2.0-only. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- .../devicetree/bindings/mfd/max14577.txt | 147 ------------- .../bindings/mfd/maxim,max14577.yaml | 195 ++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 196 insertions(+), 148 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max14577.yaml diff --git a/Documentation/devicetree/bindings/mfd/max14577.txt b/Documentation/devicetree/bindings/mfd/max14577.txt deleted file mode 100644 index be11943a0560..000000000000 --- a/Documentation/devicetree/bindings/mfd/max14577.txt +++ /dev/null @@ -1,147 +0,0 @@ -Maxim MAX14577/77836 Multi-Function Device - -MAX14577 is a Multi-Function Device with Micro-USB Interface Circuit, Li+ -Battery Charger and SFOUT LDO output for powering USB devices. It is -interfaced to host controller using I2C. - -MAX77836 additionally contains PMIC (with two LDO regulators) and Fuel Gauge. -For the description of Fuel Gauge low SOC alert interrupt see: -../power/supply/max17040_battery.txt - - -Required properties: -- compatible : Must be "maxim,max14577" or "maxim,max77836". -- reg : I2C slave address for the max14577 chip (0x25 for max14577/max77836) -- interrupts : IRQ line for the chip. - - -Required nodes: - - charger : - Node for configuring the charger driver. - Required properties: - - compatible : "maxim,max14577-charger" - or "maxim,max77836-charger" - - maxim,fast-charge-uamp : Current in uA for Fast Charge; - Valid values: - - for max14577: 90000 - 950000; - - for max77836: 45000 - 475000; - - maxim,eoc-uamp : Current in uA for End-Of-Charge mode; - Valid values: - - for max14577: 50000 - 200000; - - for max77836: 5000 - 100000; - - maxim,ovp-uvolt : OverVoltage Protection Threshold in uV; - In an overvoltage condition, INT asserts and charging - stops. Valid values: - - 6000000, 6500000, 7000000, 7500000; - - maxim,constant-uvolt : Battery Constant Voltage in uV; - Valid values: - - 4000000 - 4280000 (step by 20000); - - 4350000; - - -Optional nodes: -- max14577-muic/max77836-muic : - Node used only by extcon consumers. - Required properties: - - compatible : "maxim,max14577-muic" or "maxim,max77836-muic" - -- regulators : - Required properties: - - compatible : "maxim,max14577-regulator" - or "maxim,max77836-regulator" - - May contain a sub-node per regulator from the list below. Each - sub-node should contain the constraints and initialization information - for that regulator. See regulator.txt for a description of standard - properties for these sub-nodes. - - List of valid regulator names: - - for max14577: CHARGER, SAFEOUT. - - for max77836: CHARGER, SAFEOUT, LDO1, LDO2. - - The SAFEOUT is a fixed voltage regulator so there is no need to specify - voltages for it. - - -Example: - -#include <dt-bindings/interrupt-controller/irq.h> - -max14577@25 { - compatible = "maxim,max14577"; - reg = <0x25>; - interrupt-parent = <&gpx1>; - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; - - muic: max14577-muic { - compatible = "maxim,max14577-muic"; - }; - - regulators { - compatible = "maxim,max14577-regulator"; - - SAFEOUT { - regulator-name = "SAFEOUT"; - }; - CHARGER { - regulator-name = "CHARGER"; - regulator-min-microamp = <90000>; - regulator-max-microamp = <950000>; - regulator-boot-on; - }; - }; - - charger { - compatible = "maxim,max14577-charger"; - - maxim,constant-uvolt = <4350000>; - maxim,fast-charge-uamp = <450000>; - maxim,eoc-uamp = <50000>; - maxim,ovp-uvolt = <6500000>; - }; -}; - - -max77836@25 { - compatible = "maxim,max77836"; - reg = <0x25>; - interrupt-parent = <&gpx1>; - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; - - muic: max77836-muic { - compatible = "maxim,max77836-muic"; - }; - - regulators { - compatible = "maxim,max77836-regulator"; - - SAFEOUT { - regulator-name = "SAFEOUT"; - }; - CHARGER { - regulator-name = "CHARGER"; - regulator-min-microamp = <90000>; - regulator-max-microamp = <950000>; - regulator-boot-on; - }; - LDO1 { - regulator-name = "LDO1"; - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - }; - LDO2 { - regulator-name = "LDO2"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <3950000>; - }; - }; - - charger { - compatible = "maxim,max77836-charger"; - - maxim,constant-uvolt = <4350000>; - maxim,fast-charge-uamp = <225000>; - maxim,eoc-uamp = <7500>; - maxim,ovp-uvolt = <6500000>; - }; -}; diff --git a/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml new file mode 100644 index 000000000000..512fd671595c --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml @@ -0,0 +1,195 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/maxim,max14577.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC + +maintainers: + - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> + +description: | + This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB + Integrated Circuit (MUIC). + + The Maxim MAX14577 is a MicroUSB and Companion Power Management IC which + includes voltage safeout regulators, charger and MicroUSB management IC. + + The Maxim MAX77836 is a MicroUSB and Companion Power Management IC which + includes voltage safeout and LDO regulators, charger, fuel-gauge and MicroUSB + management IC. + +properties: + compatible: + enum: + - maxim,max14577 + - maxim,max77836 + + interrupts: + maxItems: 1 + + reg: + maxItems: 1 + + wakeup-source: true + + charger: + $ref: ../power/supply/maxim,max14577.yaml + + extcon: + type: object + properties: + compatible: + enum: + - maxim,max14577-muic + - maxim,max77836-muic + + required: + - compatible + + regulators: + $ref: ../regulator/maxim,max14577.yaml + +required: + - compatible + - interrupts + - reg + - charger + +allOf: + - if: + properties: + compatible: + contains: + const: maxim,max14577 + then: + properties: + charger: + properties: + compatible: + const: maxim,max14577-charger + extcon: + properties: + compatible: + const: maxim,max14577-muic + regulator: + properties: + compatible: + const: maxim,max14577-regulator + else: + properties: + charger: + properties: + compatible: + const: maxim,max77836-charger + extcon: + properties: + compatible: + const: maxim,max77836-muic + regulator: + properties: + compatible: + const: maxim,max77836-regulator + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pmic@25 { + compatible = "maxim,max14577"; + reg = <0x25>; + interrupt-parent = <&gpx1>; + interrupts = <5 IRQ_TYPE_LEVEL_LOW>; + + extcon { + compatible = "maxim,max14577-muic"; + }; + + regulators { + compatible = "maxim,max14577-regulator"; + + SAFEOUT { + regulator-name = "SAFEOUT"; + }; + + CHARGER { + regulator-name = "CHARGER"; + regulator-min-microamp = <90000>; + regulator-max-microamp = <950000>; + regulator-boot-on; + }; + }; + + charger { + compatible = "maxim,max14577-charger"; + + maxim,constant-uvolt = <4350000>; + maxim,fast-charge-uamp = <450000>; + maxim,eoc-uamp = <50000>; + maxim,ovp-uvolt = <6500000>; + }; + }; + }; + + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + pmic@25 { + compatible = "maxim,max77836"; + interrupt-parent = <&gpx1>; + interrupts = <5 IRQ_TYPE_NONE>; + reg = <0x25>; + wakeup-source; + + extcon { + compatible = "maxim,max77836-muic"; + }; + + regulators { + compatible = "maxim,max77836-regulator"; + + SAFEOUT { + regulator-name = "SAFEOUT"; + }; + + CHARGER { + regulator-name = "CHARGER"; + regulator-min-microamp = <45000>; + regulator-max-microamp = <475000>; + regulator-boot-on; + }; + + LDO1 { + regulator-name = "MOT_2.7V"; + regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <2700000>; + }; + + LDO2 { + regulator-name = "UNUSED_LDO2"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3950000>; + }; + }; + + charger { + compatible = "maxim,max77836-charger"; + + maxim,constant-uvolt = <4350000>; + maxim,fast-charge-uamp = <225000>; + maxim,eoc-uamp = <7500>; + maxim,ovp-uvolt = <6500000>; + }; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 13e21c229c5d..af392bd04874 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11692,11 +11692,11 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> L: linux-kernel@vger.kernel.org S: Supported +F: Documentation/devicetree/bindings/*/maxim,max14577.yaml F: Documentation/devicetree/bindings/*/maxim,max77686.yaml F: Documentation/devicetree/bindings/*/maxim,max77693.yaml F: Documentation/devicetree/bindings/*/maxim,max77843.yaml F: Documentation/devicetree/bindings/clock/maxim,max77686.txt -F: Documentation/devicetree/bindings/mfd/max14577.txt F: drivers/*/*max77843.c F: drivers/*/max14577*.c F: drivers/*/max77686*.c -- 2.32.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] dt-bindings: mfd: maxim,max14577: convert to dtschema 2021-12-29 14:15 ` [PATCH 4/4] dt-bindings: mfd: " Krzysztof Kozlowski @ 2022-01-10 19:44 ` Rob Herring 2022-01-11 17:19 ` Krzysztof Kozlowski 0 siblings, 1 reply; 8+ messages in thread From: Rob Herring @ 2022-01-10 19:44 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Lee Jones, Chanwoo Choi, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc On Wed, Dec 29, 2021 at 03:15:24PM +0100, Krzysztof Kozlowski wrote: > Convert the MFD part of Maxim MAX14577/MAX77836 MUIC to DT schema > format. The example DTS was copied from existing DTS > (exynos3250-rinato.dts), so keep the license as GPL-2.0-only. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > --- > .../devicetree/bindings/mfd/max14577.txt | 147 ------------- > .../bindings/mfd/maxim,max14577.yaml | 195 ++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 196 insertions(+), 148 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt > create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max14577.yaml > > diff --git a/Documentation/devicetree/bindings/mfd/max14577.txt b/Documentation/devicetree/bindings/mfd/max14577.txt > deleted file mode 100644 > index be11943a0560..000000000000 > --- a/Documentation/devicetree/bindings/mfd/max14577.txt > +++ /dev/null > @@ -1,147 +0,0 @@ > -Maxim MAX14577/77836 Multi-Function Device > - > -MAX14577 is a Multi-Function Device with Micro-USB Interface Circuit, Li+ > -Battery Charger and SFOUT LDO output for powering USB devices. It is > -interfaced to host controller using I2C. > - > -MAX77836 additionally contains PMIC (with two LDO regulators) and Fuel Gauge. > -For the description of Fuel Gauge low SOC alert interrupt see: > -../power/supply/max17040_battery.txt > - > - > -Required properties: > -- compatible : Must be "maxim,max14577" or "maxim,max77836". > -- reg : I2C slave address for the max14577 chip (0x25 for max14577/max77836) > -- interrupts : IRQ line for the chip. > - > - > -Required nodes: > - - charger : > - Node for configuring the charger driver. > - Required properties: > - - compatible : "maxim,max14577-charger" > - or "maxim,max77836-charger" > - - maxim,fast-charge-uamp : Current in uA for Fast Charge; > - Valid values: > - - for max14577: 90000 - 950000; > - - for max77836: 45000 - 475000; > - - maxim,eoc-uamp : Current in uA for End-Of-Charge mode; > - Valid values: > - - for max14577: 50000 - 200000; > - - for max77836: 5000 - 100000; > - - maxim,ovp-uvolt : OverVoltage Protection Threshold in uV; > - In an overvoltage condition, INT asserts and charging > - stops. Valid values: > - - 6000000, 6500000, 7000000, 7500000; > - - maxim,constant-uvolt : Battery Constant Voltage in uV; > - Valid values: > - - 4000000 - 4280000 (step by 20000); > - - 4350000; > - > - > -Optional nodes: > -- max14577-muic/max77836-muic : > - Node used only by extcon consumers. > - Required properties: > - - compatible : "maxim,max14577-muic" or "maxim,max77836-muic" > - > -- regulators : > - Required properties: > - - compatible : "maxim,max14577-regulator" > - or "maxim,max77836-regulator" > - > - May contain a sub-node per regulator from the list below. Each > - sub-node should contain the constraints and initialization information > - for that regulator. See regulator.txt for a description of standard > - properties for these sub-nodes. > - > - List of valid regulator names: > - - for max14577: CHARGER, SAFEOUT. > - - for max77836: CHARGER, SAFEOUT, LDO1, LDO2. > - > - The SAFEOUT is a fixed voltage regulator so there is no need to specify > - voltages for it. > - > - > -Example: > - > -#include <dt-bindings/interrupt-controller/irq.h> > - > -max14577@25 { > - compatible = "maxim,max14577"; > - reg = <0x25>; > - interrupt-parent = <&gpx1>; > - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; > - > - muic: max14577-muic { > - compatible = "maxim,max14577-muic"; > - }; > - > - regulators { > - compatible = "maxim,max14577-regulator"; > - > - SAFEOUT { > - regulator-name = "SAFEOUT"; > - }; > - CHARGER { > - regulator-name = "CHARGER"; > - regulator-min-microamp = <90000>; > - regulator-max-microamp = <950000>; > - regulator-boot-on; > - }; > - }; > - > - charger { > - compatible = "maxim,max14577-charger"; > - > - maxim,constant-uvolt = <4350000>; > - maxim,fast-charge-uamp = <450000>; > - maxim,eoc-uamp = <50000>; > - maxim,ovp-uvolt = <6500000>; > - }; > -}; > - > - > -max77836@25 { > - compatible = "maxim,max77836"; > - reg = <0x25>; > - interrupt-parent = <&gpx1>; > - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; > - > - muic: max77836-muic { > - compatible = "maxim,max77836-muic"; > - }; > - > - regulators { > - compatible = "maxim,max77836-regulator"; > - > - SAFEOUT { > - regulator-name = "SAFEOUT"; > - }; > - CHARGER { > - regulator-name = "CHARGER"; > - regulator-min-microamp = <90000>; > - regulator-max-microamp = <950000>; > - regulator-boot-on; > - }; > - LDO1 { > - regulator-name = "LDO1"; > - regulator-min-microvolt = <2700000>; > - regulator-max-microvolt = <2700000>; > - }; > - LDO2 { > - regulator-name = "LDO2"; > - regulator-min-microvolt = <800000>; > - regulator-max-microvolt = <3950000>; > - }; > - }; > - > - charger { > - compatible = "maxim,max77836-charger"; > - > - maxim,constant-uvolt = <4350000>; > - maxim,fast-charge-uamp = <225000>; > - maxim,eoc-uamp = <7500>; > - maxim,ovp-uvolt = <6500000>; > - }; > -}; > diff --git a/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml > new file mode 100644 > index 000000000000..512fd671595c > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml > @@ -0,0 +1,195 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/mfd/maxim,max14577.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC > + > +maintainers: > + - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > + > +description: | > + This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB > + Integrated Circuit (MUIC). > + > + The Maxim MAX14577 is a MicroUSB and Companion Power Management IC which > + includes voltage safeout regulators, charger and MicroUSB management IC. > + > + The Maxim MAX77836 is a MicroUSB and Companion Power Management IC which > + includes voltage safeout and LDO regulators, charger, fuel-gauge and MicroUSB > + management IC. > + > +properties: > + compatible: > + enum: > + - maxim,max14577 > + - maxim,max77836 > + > + interrupts: > + maxItems: 1 > + > + reg: > + maxItems: 1 > + > + wakeup-source: true > + > + charger: > + $ref: ../power/supply/maxim,max14577.yaml /schemas/power/... With those fixed, Reviewed-by: Rob Herring <robh@kernel.org> > + > + extcon: > + type: object > + properties: > + compatible: > + enum: > + - maxim,max14577-muic > + - maxim,max77836-muic > + > + required: > + - compatible > + > + regulators: > + $ref: ../regulator/maxim,max14577.yaml > + > +required: > + - compatible > + - interrupts > + - reg > + - charger > + > +allOf: > + - if: > + properties: > + compatible: > + contains: > + const: maxim,max14577 > + then: > + properties: > + charger: > + properties: > + compatible: > + const: maxim,max14577-charger > + extcon: > + properties: > + compatible: > + const: maxim,max14577-muic > + regulator: > + properties: > + compatible: > + const: maxim,max14577-regulator > + else: > + properties: > + charger: > + properties: > + compatible: > + const: maxim,max77836-charger > + extcon: > + properties: > + compatible: > + const: maxim,max77836-muic > + regulator: > + properties: > + compatible: > + const: maxim,max77836-regulator > + > +additionalProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + > + pmic@25 { > + compatible = "maxim,max14577"; > + reg = <0x25>; > + interrupt-parent = <&gpx1>; > + interrupts = <5 IRQ_TYPE_LEVEL_LOW>; > + > + extcon { > + compatible = "maxim,max14577-muic"; > + }; > + > + regulators { > + compatible = "maxim,max14577-regulator"; > + > + SAFEOUT { > + regulator-name = "SAFEOUT"; > + }; > + > + CHARGER { > + regulator-name = "CHARGER"; > + regulator-min-microamp = <90000>; > + regulator-max-microamp = <950000>; > + regulator-boot-on; > + }; > + }; > + > + charger { > + compatible = "maxim,max14577-charger"; > + > + maxim,constant-uvolt = <4350000>; > + maxim,fast-charge-uamp = <450000>; > + maxim,eoc-uamp = <50000>; > + maxim,ovp-uvolt = <6500000>; > + }; > + }; > + }; > + > + - | > + #include <dt-bindings/interrupt-controller/irq.h> > + > + i2c { > + #address-cells = <1>; > + #size-cells = <0>; > + > + pmic@25 { > + compatible = "maxim,max77836"; > + interrupt-parent = <&gpx1>; > + interrupts = <5 IRQ_TYPE_NONE>; > + reg = <0x25>; > + wakeup-source; > + > + extcon { > + compatible = "maxim,max77836-muic"; > + }; > + > + regulators { > + compatible = "maxim,max77836-regulator"; > + > + SAFEOUT { > + regulator-name = "SAFEOUT"; > + }; > + > + CHARGER { > + regulator-name = "CHARGER"; > + regulator-min-microamp = <45000>; > + regulator-max-microamp = <475000>; > + regulator-boot-on; > + }; > + > + LDO1 { > + regulator-name = "MOT_2.7V"; > + regulator-min-microvolt = <1100000>; > + regulator-max-microvolt = <2700000>; > + }; > + > + LDO2 { > + regulator-name = "UNUSED_LDO2"; > + regulator-min-microvolt = <800000>; > + regulator-max-microvolt = <3950000>; > + }; > + }; > + > + charger { > + compatible = "maxim,max77836-charger"; > + > + maxim,constant-uvolt = <4350000>; > + maxim,fast-charge-uamp = <225000>; > + maxim,eoc-uamp = <7500>; > + maxim,ovp-uvolt = <6500000>; > + }; > + }; > + }; > diff --git a/MAINTAINERS b/MAINTAINERS > index 13e21c229c5d..af392bd04874 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -11692,11 +11692,11 @@ M: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > L: linux-kernel@vger.kernel.org > S: Supported > +F: Documentation/devicetree/bindings/*/maxim,max14577.yaml > F: Documentation/devicetree/bindings/*/maxim,max77686.yaml > F: Documentation/devicetree/bindings/*/maxim,max77693.yaml > F: Documentation/devicetree/bindings/*/maxim,max77843.yaml > F: Documentation/devicetree/bindings/clock/maxim,max77686.txt > -F: Documentation/devicetree/bindings/mfd/max14577.txt > F: drivers/*/*max77843.c > F: drivers/*/max14577*.c > F: drivers/*/max77686*.c > -- > 2.32.0 > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] dt-bindings: mfd: maxim,max14577: convert to dtschema 2022-01-10 19:44 ` Rob Herring @ 2022-01-11 17:19 ` Krzysztof Kozlowski 0 siblings, 0 replies; 8+ messages in thread From: Krzysztof Kozlowski @ 2022-01-11 17:19 UTC (permalink / raw) To: Rob Herring Cc: Lee Jones, Chanwoo Choi, Sebastian Reichel, Liam Girdwood, Mark Brown, devicetree, linux-kernel, linux-pm, linux-arm-kernel, linux-samsung-soc On 10/01/2022 20:44, Rob Herring wrote: > On Wed, Dec 29, 2021 at 03:15:24PM +0100, Krzysztof Kozlowski wrote: >> Convert the MFD part of Maxim MAX14577/MAX77836 MUIC to DT schema >> format. The example DTS was copied from existing DTS >> (exynos3250-rinato.dts), so keep the license as GPL-2.0-only. >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> >> --- >> .../devicetree/bindings/mfd/max14577.txt | 147 ------------- >> .../bindings/mfd/maxim,max14577.yaml | 195 ++++++++++++++++++ >> MAINTAINERS | 2 +- >> 3 files changed, 196 insertions(+), 148 deletions(-) >> delete mode 100644 Documentation/devicetree/bindings/mfd/max14577.txt >> create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max14577.yaml >> >> diff --git a/Documentation/devicetree/bindings/mfd/max14577.txt b/Documentation/devicetree/bindings/mfd/max14577.txt >> deleted file mode 100644 >> index be11943a0560..000000000000 >> --- a/Documentation/devicetree/bindings/mfd/max14577.txt >> +++ /dev/null >> @@ -1,147 +0,0 @@ >> -Maxim MAX14577/77836 Multi-Function Device >> - >> -MAX14577 is a Multi-Function Device with Micro-USB Interface Circuit, Li+ >> -Battery Charger and SFOUT LDO output for powering USB devices. It is >> -interfaced to host controller using I2C. >> - >> -MAX77836 additionally contains PMIC (with two LDO regulators) and Fuel Gauge. >> -For the description of Fuel Gauge low SOC alert interrupt see: >> -../power/supply/max17040_battery.txt >> - >> - >> -Required properties: >> -- compatible : Must be "maxim,max14577" or "maxim,max77836". >> -- reg : I2C slave address for the max14577 chip (0x25 for max14577/max77836) >> -- interrupts : IRQ line for the chip. >> - >> - >> -Required nodes: >> - - charger : >> - Node for configuring the charger driver. >> - Required properties: >> - - compatible : "maxim,max14577-charger" >> - or "maxim,max77836-charger" >> - - maxim,fast-charge-uamp : Current in uA for Fast Charge; >> - Valid values: >> - - for max14577: 90000 - 950000; >> - - for max77836: 45000 - 475000; >> - - maxim,eoc-uamp : Current in uA for End-Of-Charge mode; >> - Valid values: >> - - for max14577: 50000 - 200000; >> - - for max77836: 5000 - 100000; >> - - maxim,ovp-uvolt : OverVoltage Protection Threshold in uV; >> - In an overvoltage condition, INT asserts and charging >> - stops. Valid values: >> - - 6000000, 6500000, 7000000, 7500000; >> - - maxim,constant-uvolt : Battery Constant Voltage in uV; >> - Valid values: >> - - 4000000 - 4280000 (step by 20000); >> - - 4350000; >> - >> - >> -Optional nodes: >> -- max14577-muic/max77836-muic : >> - Node used only by extcon consumers. >> - Required properties: >> - - compatible : "maxim,max14577-muic" or "maxim,max77836-muic" >> - >> -- regulators : >> - Required properties: >> - - compatible : "maxim,max14577-regulator" >> - or "maxim,max77836-regulator" >> - >> - May contain a sub-node per regulator from the list below. Each >> - sub-node should contain the constraints and initialization information >> - for that regulator. See regulator.txt for a description of standard >> - properties for these sub-nodes. >> - >> - List of valid regulator names: >> - - for max14577: CHARGER, SAFEOUT. >> - - for max77836: CHARGER, SAFEOUT, LDO1, LDO2. >> - >> - The SAFEOUT is a fixed voltage regulator so there is no need to specify >> - voltages for it. >> - >> - >> -Example: >> - >> -#include <dt-bindings/interrupt-controller/irq.h> >> - >> -max14577@25 { >> - compatible = "maxim,max14577"; >> - reg = <0x25>; >> - interrupt-parent = <&gpx1>; >> - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; >> - >> - muic: max14577-muic { >> - compatible = "maxim,max14577-muic"; >> - }; >> - >> - regulators { >> - compatible = "maxim,max14577-regulator"; >> - >> - SAFEOUT { >> - regulator-name = "SAFEOUT"; >> - }; >> - CHARGER { >> - regulator-name = "CHARGER"; >> - regulator-min-microamp = <90000>; >> - regulator-max-microamp = <950000>; >> - regulator-boot-on; >> - }; >> - }; >> - >> - charger { >> - compatible = "maxim,max14577-charger"; >> - >> - maxim,constant-uvolt = <4350000>; >> - maxim,fast-charge-uamp = <450000>; >> - maxim,eoc-uamp = <50000>; >> - maxim,ovp-uvolt = <6500000>; >> - }; >> -}; >> - >> - >> -max77836@25 { >> - compatible = "maxim,max77836"; >> - reg = <0x25>; >> - interrupt-parent = <&gpx1>; >> - interrupts = <5 IRQ_TYPE_LEVEL_LOW>; >> - >> - muic: max77836-muic { >> - compatible = "maxim,max77836-muic"; >> - }; >> - >> - regulators { >> - compatible = "maxim,max77836-regulator"; >> - >> - SAFEOUT { >> - regulator-name = "SAFEOUT"; >> - }; >> - CHARGER { >> - regulator-name = "CHARGER"; >> - regulator-min-microamp = <90000>; >> - regulator-max-microamp = <950000>; >> - regulator-boot-on; >> - }; >> - LDO1 { >> - regulator-name = "LDO1"; >> - regulator-min-microvolt = <2700000>; >> - regulator-max-microvolt = <2700000>; >> - }; >> - LDO2 { >> - regulator-name = "LDO2"; >> - regulator-min-microvolt = <800000>; >> - regulator-max-microvolt = <3950000>; >> - }; >> - }; >> - >> - charger { >> - compatible = "maxim,max77836-charger"; >> - >> - maxim,constant-uvolt = <4350000>; >> - maxim,fast-charge-uamp = <225000>; >> - maxim,eoc-uamp = <7500>; >> - maxim,ovp-uvolt = <6500000>; >> - }; >> -}; >> diff --git a/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml >> new file mode 100644 >> index 000000000000..512fd671595c >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mfd/maxim,max14577.yaml >> @@ -0,0 +1,195 @@ >> +# SPDX-License-Identifier: GPL-2.0-only >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/mfd/maxim,max14577.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Maxim MAX14577/MAX77836 MicroUSB and Companion Power Management IC >> + >> +maintainers: >> + - Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> >> + >> +description: | >> + This is a part of device tree bindings for Maxim MAX14577/MAX77836 MicroUSB >> + Integrated Circuit (MUIC). >> + >> + The Maxim MAX14577 is a MicroUSB and Companion Power Management IC which >> + includes voltage safeout regulators, charger and MicroUSB management IC. >> + >> + The Maxim MAX77836 is a MicroUSB and Companion Power Management IC which >> + includes voltage safeout and LDO regulators, charger, fuel-gauge and MicroUSB >> + management IC. >> + >> +properties: >> + compatible: >> + enum: >> + - maxim,max14577 >> + - maxim,max77836 >> + >> + interrupts: >> + maxItems: 1 >> + >> + reg: >> + maxItems: 1 >> + >> + wakeup-source: true >> + >> + charger: >> + $ref: ../power/supply/maxim,max14577.yaml > > /schemas/power/... > > With those fixed, > > Reviewed-by: Rob Herring <robh@kernel.org> Thanks, fixed also regulator reference below and the regulator bindings as in my other Maxim patches. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-01-11 17:20 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-12-29 14:15 [PATCH 0/4] mfd/power/regulators: dt-bindings: max14577: convert to dtschema Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 1/4] ARM: dts: exynos: Align MAX77836 nodes with dtschema on Monk and Rinato Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 2/4] dt-bindings: power: supply: maxim,max14577: convert to dtschema Krzysztof Kozlowski 2022-01-10 19:42 ` Rob Herring 2021-12-29 14:15 ` [PATCH 3/4] regulator: dt-bindings: " Krzysztof Kozlowski 2021-12-29 14:15 ` [PATCH 4/4] dt-bindings: mfd: " Krzysztof Kozlowski 2022-01-10 19:44 ` Rob Herring 2022-01-11 17:19 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).