dt-bindings: regulator: qcom,spmi-regulator: Convert to dtschema
Subsystems (4)
PATCH 1/6 dt-bindings: regulator: qcom,spmi-regulator: Convert to dtschema
Convert the bindings of Qualcomm SPMI regulators to DT schema.
---
I am aware that syscon alone is not really acceptable, its converted directly from the old text bindings.
There is also the issue of some MSM8994, MSM8996 and APQ8096 devices using '#address-cells', '#size-cells', some even defining reg property for regulators.
Any advice on how to solve these issues is appreciated.
--- .../regulator/qcom,spmi-regulator.yaml | 176 ++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +176 -0
@@ -0,0 +1,176 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/qcom,spmi-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SPMI Regulators + +maintainers: + - Robert Marko <[email protected]> + +properties: + compatible: + enum: + - qcom,pm660-regulators + - qcom,pm660l-regulators + - qcom,pm8004-regulators + - qcom,pm8005-regulators + - qcom,pm8226-regulators + - qcom,pm8841-regulators + - qcom,pm8916-regulators + - qcom,pm8941-regulators + - qcom,pm8950-regulators + - qcom,pm8994-regulators + - qcom,pmi8994-regulators + - qcom,pms405-regulators + + qcom,saw-reg: + description: Reference to syscon node defining the SAW registers + $ref: "/schemas/types.yaml#/definitions/phandle" + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,pm8941-regulators + then: + properties: + interrupts: + items: + - description: Over-current protection interrupt for 5V S1 + - description: Over-current protection interrupt for 5V S2 + interrupt-names: + items: + - const: ocp-5vs1 + - const: ocp-5vs2 + +patternProperties: + ".*-supply$": + description: Input supply phandle(s) for this node + $ref: "/schemas/types.yaml#/definitions/phandle" + + "^((s|l|lvs|5vs)[0-9]*)$": + description: List of regulators and its properties + $ref: regulator.yaml# + + properties: + qcom,ocp-max-retries: + description: + Maximum number of times to try toggling a voltage switch off and + back on as a result of consecutive over current events + $ref: "/schemas/types.yaml#/definitions/uint32" + + qcom,ocp-retry-delay: + description: + Time to delay in milliseconds between each voltage switch toggle + after an over current event takes place + $ref: "/schemas/types.yaml#/definitions/uint32" + + qcom,pin-ctrl-enable: + description: + Bit mask specifying which hardware pins should be used to enable the + regulator, if any. + Supported bits are + 0 = ignore all hardware enable signals + BIT(0) = follow HW0_EN signal + BIT(1) = follow HW1_EN signal + BIT(2) = follow HW2_EN signal + BIT(3) = follow HW3_EN signal + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 15 + + qcom,pin-ctrl-hpm: + description: + Bit mask specifying which hardware pins should be used to force the + regulator into high power mode, if any. + Supported bits are + 0 = ignore all hardware enable signals + BIT(0) = follow HW0_EN signal + BIT(1) = follow HW1_EN signal + BIT(2) = follow HW2_EN signal + BIT(3) = follow HW3_EN signal + BIT(4) = follow PMIC awake state + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 31 + + qcom,vs-soft-start-strength: + description: + This property sets the soft start strength for voltage switch type + regulators. + Supported values are + 0 = 0.05 uA + 1 = 0.25 uA + 2 = 0.55 uA + 3 = 0.75 uA + $ref: "/schemas/types.yaml#/definitions/uint32" + minimum: 0 + maximum: 3 + + qcom,saw-slave: + description: SAW controlled gang slave. Will not be configured. + type: boolean + + qcom,saw-leader: + description: + SAW controlled gang leader. Will be configured as SAW regulator. + type: boolean + + unevaluatedProperties: false + +unevaluatedProperties: false + +required: + - compatible + +examples: + - | + regulators { + compatible = "qcom,pm8941-regulators"; + vdd_l1_l3-supply = <&s1>; + + s1: s1 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1400000>; + }; + + l1: l1 { + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1300000>; + }; + }; + + - | + saw3: syscon@9a10000 { + compatible = "syscon"; + reg = <0x9a10000 0x1000>; + }; + + regulators { + compatible = "qcom,pm8994-regulators"; + qcom,saw-reg = <&saw3>; + + s8 { + qcom,saw-slave; + }; + + s9 { + qcom,saw-slave; + }; + + s10 { + qcom,saw-slave; + }; + + pm8994_s11_saw: s11 { + qcom,saw-leader; + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1140000>; + }; + }; +...
Signature · 1 line
2.36.1
PATCH 2/6 regulator: qcom_spmi: add support for HT_P150
HT_P150 is a LDO PMOS regulator based on LV P150 using HFS430 layout found in PMP8074 and PMS405 PMIC-s.
Both PMP8074 and PMS405 define the programmable range as 1.616V to 3.304V but the actual MAX output voltage depends on the exact LDO in each of the PMIC-s.
It has a max current of 150mA, voltage step of 8mV.
--- drivers/regulator/qcom_spmi-regulator.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/regulator/qcom_spmi-regulator.c +7 -0
@@ -164,6 +164,7 @@ enum spmi_regulator_subtype {SPMI_REGULATOR_SUBTYPE_ULT_HF_CTL3 =0x0f ,SPMI_REGULATOR_SUBTYPE_ULT_HF_CTL4 =0x10 ,SPMI_REGULATOR_SUBTYPE_HFS430 =0x0a , + SPMI_REGULATOR_SUBTYPE_HT_P150 = 0x35, }; enum spmi_common_regulator_registers {
@@ -544,6 +545,10 @@ static struct spmi_voltage_range hfs430_ranges[] = { SPMI_VOLTAGE_RANGE(0, 320000, 320000, 2040000, 2040000, 8000), }; +static struct spmi_voltage_range ht_p150_ranges[] = { +SPMI_VOLTAGE_RANGE (0 ,1616000 ,1616000 ,3304000 ,3304000 ,8000 ), +}; +static DEFINE_SPMI_SET_POINTS (pldo);static DEFINE_SPMI_SET_POINTS (nldo1);static DEFINE_SPMI_SET_POINTS (nldo2);
@@ -564,6 +569,7 @@ static DEFINE_SPMI_SET_POINTS(nldo660);static DEFINE_SPMI_SET_POINTS (ht_lvpldo);static DEFINE_SPMI_SET_POINTS (ht_nldo);static DEFINE_SPMI_SET_POINTS (hfs430); +static DEFINE_SPMI_SET_POINTS (ht_p150);static inline int spmi_vreg_read (struct spmi_regulator *vreg,u16 addr,u8 *buf,int len)
@@ -1458,6 +1464,7 @@ static const struct regulator_ops spmi_hfs430_ops = {static const struct spmi_regulator_mapping supported_regulators[] = {/* type subtype dig_min dig_max ltype ops setpoints hpm_min */ +SPMI_VREG (LDO ,HT_P150 ,0 ,INF ,HFS430 , hfs430, ht_p150,10000 ),SPMI_VREG (BUCK ,GP_CTL ,0 ,INF ,SMPS , smps, smps,100000 ),SPMI_VREG (BUCK ,HFS430 ,0 ,INF ,HFS430 , hfs430, hfs430,10000 ),SPMI_VREG (LDO ,N300 ,0 ,INF ,LDO , ldo, nldo1,10000 ),
Signature · 1 line
2.36.1
PATCH 3/6 dt-bindings: regulator: qcom,spmi-regulator: add PMP8074 PMIC
In reply to Robert MarkoDocument the PMP8074 PMIC compatible.
--- .../devicetree/bindings/regulator/qcom,spmi-regulator.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml +1 -0
@@ -23,6 +23,7 @@ properties: - qcom,pm8950-regulators - qcom,pm8994-regulators - qcom,pmi8994-regulators + - qcom,pmp8074-regulators - qcom,pms405-regulators qcom,saw-reg:
Signature · 1 line
2.36.1
PATCH 4/6 regulator: qcom_spmi: Add support for PMP8074 regulators
In reply to Robert MarkoPMP8074 is a companion PMIC for the Qualcomm IPQ8074 WiSoC-s.
It features 5 HF-SMPS and 13 LDO regulators.
This commit adds support for S3 and S4 HF-SMPS buck regulators of the HFS430 type and LDO11 of the HT_P150 type.
S3 is the CPU cluster voltage supply, S4 supplies the UBI32 NPU cores and LDO11 is the SDIO/eMMC I/O voltage regulator required for high speeds.
--- drivers/regulator/qcom_spmi-regulator.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/regulator/qcom_spmi-regulator.c +8 -0
@@ -2137,6 +2137,13 @@ static const struct spmi_regulator_data pms405_regulators[] = { { } }; +static const struct spmi_regulator_data pmp8074_regulators[] = { + {"s3" ,0x1a00 ,"vdd_s3" }, + {"s4" ,0x1d00 ,"vdd_s4" }, + {"l11" ,0x4a00 ,"vdd_l10_l11_l12_l13" }, + { } +}; +static const struct of_device_id qcom_spmi_regulator_match[] = { { .compatible ="qcom,pm8004-regulators" , .data = &pm8004_regulators }, { .compatible ="qcom,pm8005-regulators" , .data = &pm8005_regulators },
@@ -2150,6 +2157,7 @@ static const struct of_device_id qcom_spmi_regulator_match[] = { { .compatible = "qcom,pm660-regulators", .data = &pm660_regulators }, { .compatible = "qcom,pm660l-regulators", .data = &pm660l_regulators }, { .compatible = "qcom,pms405-regulators", .data = &pms405_regulators }, + { .compatible = "qcom,pmp8074-regulators", .data = &pmp8074_regulators }, { } };MODULE_DEVICE_TABLE (of, qcom_spmi_regulator_match);
Signature · 1 line
2.36.1
PATCH 5/6 arm64: dts: ipq8074: add SPMI PMP8074 PMIC regulators
In reply to Robert MarkoPMP8074 is used in IPQ8074 and provides S3 for cores, S4 for UBI core and LDO11 for SDIO/eMMC.
So, lets add the nodes in preparation for DVFS later.
--- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
arch/arm64/boot/dts/qcom/ipq8074.dtsi +34 -0
@@ -5,6 +5,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/qcom,gcc-ipq8074.h> +#include <dt-bindings/spmi/spmi.h> / { model = "Qualcomm Technologies, Inc. IPQ8074";
@@ -421,6 +422,39 @@ spmi_bus: spmi@200f000 { interrupt-controller; #interrupt-cells = <4>; cell-index = <0>; + + pmic@1 { + compatible ="qcom,spmi-pmic"; + reg = <0x1 SPMI_USID>; + #address-cells = <1>; + #size-cells = <0>; + + regulators { + compatible = "qcom,pmp8074-regulators"; + + s3: s3 { + regulator-name = "vdd_s3"; + regulator-min-microvolt = <592000>; + regulator-max-microvolt = <1064000>; + regulator-always-on; + regulator-boot-on; + }; + + s4: s4 { + regulator-name = "vdd_s4"; + regulator-min-microvolt = <712000>; + regulator-max-microvolt = <992000>; + regulator-always-on; + regulator-boot-on; + }; + + l11: l11 { + regulator-name = "l11"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + }; + }; }; sdhc_1: sdhci@7824900 {
Signature · 1 line
2.36.1
PATCH 6/6 arm64: dts: ipq8074: add VQMMC supply
In reply to Robert MarkoSDHCI controller claims DDR, HS200 and HS400 1.8V support, however it cannot achieve those using the 2.95V I/O that is the default set by firmware.
Since we know have access to the PMP8074 PMIC provided LDO that provides the I/O voltage set it as VQMMC supply so that higher speeds can actually be achieved.
--- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/ipq8074.dtsi +2 -0
@@ -476,6 +476,8 @@ sdhc_1: sdhci@7824900 { mmc-hs400-1_8v; bus-width = <8>; + vqmmc-supply = <&l11>; + status = "disabled"; };
Signature · 1 line
2.36.1
Quoted 7 lines · Robert Marko
Convert the bindings of Qualcomm SPMI regulators to DT schema.
Signed-off-by Robert Marko <[email protected]>---
I am aware that syscon alone is not really acceptable, its converted directly from the old text bindings.
Quoted 7 lines
There is also the issue of some MSM8994, MSM8996 and APQ8096 devices using '#address-cells', '#size-cells', some even defining reg property for regulators.
Any advice on how to solve these issues is appreciated.
--- .../regulator/qcom,spmi-regulator.yaml | 176 ++++++++++++++++++
You miss here the actual conversion... where is the removal of old file?
Quoted 49 lines
1 file changed, 176 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yamlDocumentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +40
-0@@ -0,0 +1,176 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/qcom,spmi-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SPMI Regulators + +maintainers: + - Robert Marko <[email protected]> + +properties: + compatible: + enum: + - qcom,pm660-regulators + - qcom,pm660l-regulators + - qcom,pm8004-regulators + - qcom,pm8005-regulators + - qcom,pm8226-regulators + - qcom,pm8841-regulators + - qcom,pm8916-regulators + - qcom,pm8941-regulators + - qcom,pm8950-regulators + - qcom,pm8994-regulators + - qcom,pmi8994-regulators + - qcom,pms405-regulators + + qcom,saw-reg: + description: Reference to syscon node defining the SAW registers + $ref: "/schemas/types.yaml#/definitions/phandle" + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,pm8941-regulators + then: + properties:
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml line 50
Quoted 10 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +10
-0+ interrupts: + items: + - description: Over-current protection interrupt for 5V S1 + - description: Over-current protection interrupt for 5V S2 + interrupt-names: + items: + - const: ocp-5vs1 + - const: ocp-5vs2 + +patternProperties:
This goes just after "properties:"
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml line 54
Quoted 4 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +4
-0+ ".*-supply$": + description: Input supply phandle(s) for this node + $ref: "/schemas/types.yaml#/definitions/phandle" +
Best regards,
Krzysztof
Quoted 13 lines · Krzysztof Kozlowski
Quoted 11 lines · Robert Marko
Convert the bindings of Qualcomm SPMI regulators to DT schema.
Signed-off-by Robert Marko <[email protected]>---
I am aware that syscon alone is not really acceptable, its converted directly from the old text bindings.There is also the issue of some MSM8994, MSM8996 and APQ8096 devices using '#address-cells', '#size-cells', some even defining reg property for regulators.
Quoted 5 lines
Quoted 3 lines
Any advice on how to solve these issues is appreciated.
--- .../regulator/qcom,spmi-regulator.yaml | 176 ++++++++++++++++++You miss here the actual conversion... where is the removal of old file?
Hi,
Oh yeah, sorry for forgetting this.
Will fixup in v2.
Quoted 54 lines
Quoted 54 lines
1 file changed, 176 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yamlDocumentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +44
-0@@ -0,0 +1,176 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/qcom,spmi-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm SPMI Regulators + +maintainers: + - Robert Marko <[email protected]> + +properties: + compatible: + enum: + - qcom,pm660-regulators + - qcom,pm660l-regulators + - qcom,pm8004-regulators + - qcom,pm8005-regulators + - qcom,pm8226-regulators + - qcom,pm8841-regulators + - qcom,pm8916-regulators + - qcom,pm8941-regulators + - qcom,pm8950-regulators + - qcom,pm8994-regulators + - qcom,pmi8994-regulators + - qcom,pms405-regulators + + qcom,saw-reg: + description: Reference to syscon node defining the SAW registers + $ref: "/schemas/types.yaml#/definitions/phandle" + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,pm8941-regulators + then: + properties: + interrupts: + items: + - description: Over-current protection interrupt for 5V S1 + - description: Over-current protection interrupt for 5V S2
Quoted 8 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml line 50
Quoted 6 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +6
-0+ interrupt-names: + items: + - const: ocp-5vs1 + - const: ocp-5vs2 + +patternProperties:This goes just after "properties:"
Will fixup in v2.
Regards,
Robert
Quoted 8 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml line 54
Quoted 5 lines
Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml new file +4
-0+ ".*-supply$": + description: Input supply phandle(s) for this node + $ref: "/schemas/types.yaml#/definitions/phandle" +Best regards,
Krzysztof