Unverified Commit dd0df58b authored by Mark Brown's avatar Mark Brown
Browse files

regulator: qcom-rpmh: Add support for PM8550 

Merge series from Abel Vesa <abel.vesa@linaro.org>:

This patchset adds regulator support for the new Qualcomm PM8550 PMIC.
parents c23fdf9e e6e3776d

Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml

+24 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ description: | 
      For PM8350, smps1 - smps12, ldo1 - ldo10

      For PM8350C, smps1 - smps10, ldo1 - ldo13, bob

      For PM8450, smps1 - smps6, ldo1 - ldo4

      For PM8550, smps1 - smps6, ldo1 - ldo17, bob1 - bob2

      For PM8998, smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2

      For PMI8998, bob

      For PMR735A, smps1 - smps3, ldo1 - ldo7
@@ -70,6 +71,9 @@ properties: 
      - qcom,pm8350-rpmh-regulators

      - qcom,pm8350c-rpmh-regulators

      - qcom,pm8450-rpmh-regulators

      - qcom,pm8550-rpmh-regulators

      - qcom,pm8550ve-rpmh-regulators

      - qcom,pm8550vs-rpmh-regulators

      - qcom,pm8998-rpmh-regulators

      - qcom,pmg1110-rpmh-regulators

      - qcom,pmi8998-rpmh-regulators
@@ -83,7 +87,7 @@ properties: 
        RPMh resource name suffix used for the regulators found

        on this PMIC.

    $ref: /schemas/types.yaml#/definitions/string

    enum: [a, b, c, d, e, f, h, k]

    enum: [a, b, c, d, e, f, g, h, k]



  qcom,always-wait-for-ack:

    description: |
@@ -107,7 +111,7 @@ properties: 
      regulator-allow-set-load: ["regulator-allowed-modes"]



patternProperties:

  "^(smps|ldo|lvs)[0-9]+$":

  "^(smps|ldo|lvs|bob)[0-9]+$":

    type: object

    $ref: "regulator.yaml#"

    description: smps/ldo regulator nodes(s).
@@ -299,6 +303,24 @@ allOf: 
        "^vdd-l[1-4]-supply$": true

        "^vdd-s[1-6]-supply$": true



  - if:

      properties:

        compatible:

          enum:

            - qcom,pm8550-rpmh-regulators

            - qcom,pm8550ve-rpmh-regulators

            - qcom,pm8550vs-rpmh-regulators

    then:

      properties:

        vdd-l2-l13-l14-supply: true

        vdd-l5-l16-supply: true

        vdd-l6-l7-supply: true

        vdd-l8-l9-supply: true

      patternProperties:

        "^vdd-l([1-4]|1[0-7])-supply$": true

        "^vdd-s[1-6]-supply$": true

        "^vdd-bob[1-2]-supply$": true



  - if:

      properties:

        compatible:

drivers/regulator/qcom-rpmh-regulator.c

+81 −0
Original line number Diff line number Diff line
@@ -731,6 +731,24 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps520 = { 
	.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,

};



static const struct rpmh_vreg_hw_data pmic5_ftsmps525_lv = {

	.regulator_type = VRM,

	.ops = &rpmh_regulator_vrm_ops,

	.voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 267, 4000),

	.n_voltages = 268,

	.pmic_mode_map = pmic_mode_map_pmic5_smps,

	.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,

};



static const struct rpmh_vreg_hw_data pmic5_ftsmps525_mv = {

	.regulator_type = VRM,

	.ops = &rpmh_regulator_vrm_ops,

	.voltage_range = REGULATOR_LINEAR_RANGE(600000, 0, 267, 8000),

	.n_voltages = 268,

	.pmic_mode_map = pmic_mode_map_pmic5_smps,

	.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,

};



static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = {

	.regulator_type = VRM,

	.ops = &rpmh_regulator_vrm_ops,
@@ -987,6 +1005,57 @@ static const struct rpmh_vreg_init_data pm8450_vreg_data[] = { 
	{}

};



static const struct rpmh_vreg_init_data pm8550_vreg_data[] = {

	RPMH_VREG("ldo1",   "ldo%s1",  &pmic5_pldo,    "vdd-l1-l4-l10"),

	RPMH_VREG("ldo2",   "ldo%s2",  &pmic5_pldo,    "vdd-l2-l13-l14"),

	RPMH_VREG("ldo3",   "ldo%s3",  &pmic5_nldo,    "vdd-l3"),

	RPMH_VREG("ldo4",   "ldo%s4",  &pmic5_nldo,    "vdd-l1-l4-l10"),

	RPMH_VREG("ldo5",   "ldo%s5",  &pmic5_pldo,    "vdd-l5-l16"),

	RPMH_VREG("ldo6",   "ldo%s6",  &pmic5_pldo_lv, "vdd-l6-l7"),

	RPMH_VREG("ldo7",   "ldo%s7",  &pmic5_pldo_lv, "vdd-l6-l7"),

	RPMH_VREG("ldo8",   "ldo%s8",  &pmic5_pldo_lv, "vdd-l8-l9"),

	RPMH_VREG("ldo9",   "ldo%s9",  &pmic5_pldo,    "vdd-l8-l9"),

	RPMH_VREG("ldo10",  "ldo%s10", &pmic5_nldo,    "vdd-l1-l4-l10"),

	RPMH_VREG("ldo11",  "ldo%s11", &pmic5_pldo,    "vdd-l11"),

	RPMH_VREG("ldo12",  "ldo%s12", &pmic5_pldo,    "vdd-l12"),

	RPMH_VREG("ldo13",  "ldo%s13", &pmic5_pldo,    "vdd-l2-l13-l14"),

	RPMH_VREG("ldo14",  "ldo%s14", &pmic5_pldo,    "vdd-l2-l13-l14"),

	RPMH_VREG("ldo15",  "ldo%s15", &pmic5_pldo,    "vdd-l15"),

	RPMH_VREG("ldo16",  "ldo%s16", &pmic5_pldo,    "vdd-l5-l16"),

	RPMH_VREG("ldo17",  "ldo%s17", &pmic5_pldo,    "vdd-l17"),

	RPMH_VREG("bob1",   "bob%s1",  &pmic5_bob,     "vdd-bob1"),

	RPMH_VREG("bob2",   "bob%s2",  &pmic5_bob,     "vdd-bob2"),

	{}

};



static const struct rpmh_vreg_init_data pm8550vs_vreg_data[] = {

	RPMH_VREG("smps1",  "smp%s1",  &pmic5_ftsmps525_lv, "vdd-s1"),

	RPMH_VREG("smps2",  "smp%s2",  &pmic5_ftsmps525_lv, "vdd-s2"),

	RPMH_VREG("smps3",  "smp%s3",  &pmic5_ftsmps525_lv, "vdd-s3"),

	RPMH_VREG("smps4",  "smp%s4",  &pmic5_ftsmps525_lv, "vdd-s4"),

	RPMH_VREG("smps5",  "smp%s5",  &pmic5_ftsmps525_lv, "vdd-s5"),

	RPMH_VREG("smps6",  "smp%s6",  &pmic5_ftsmps525_mv, "vdd-s6"),

	RPMH_VREG("ldo1",   "ldo%s1",  &pmic5_nldo,   "vdd-l1"),

	RPMH_VREG("ldo2",   "ldo%s2",  &pmic5_nldo,   "vdd-l2"),

	RPMH_VREG("ldo3",   "ldo%s3",  &pmic5_nldo,   "vdd-l3"),

	{}

};



static const struct rpmh_vreg_init_data pm8550ve_vreg_data[] = {

	RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps525_lv, "vdd-s1"),

	RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps525_lv, "vdd-s2"),

	RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps525_lv, "vdd-s3"),

	RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps525_lv, "vdd-s4"),

	RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps525_lv, "vdd-s5"),

	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_lv, "vdd-s6"),

	RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps525_lv, "vdd-s7"),

	RPMH_VREG("smps8", "smp%s8", &pmic5_ftsmps525_lv, "vdd-s8"),

	RPMH_VREG("ldo1",  "ldo%s1", &pmic5_nldo,   "vdd-l1"),

	RPMH_VREG("ldo2",  "ldo%s2", &pmic5_nldo,   "vdd-l2"),

	RPMH_VREG("ldo3",  "ldo%s3", &pmic5_nldo,   "vdd-l3"),

	{}

};



static const struct rpmh_vreg_init_data pm8009_vreg_data[] = {

	RPMH_VREG("smps1",  "smp%s1",  &pmic5_hfsmps510, "vdd-s1"),

	RPMH_VREG("smps2",  "smp%s2",  &pmic5_hfsmps515, "vdd-s2"),
@@ -1314,6 +1383,18 @@ static const struct of_device_id __maybe_unused rpmh_regulator_match_table[] = { 
		.compatible = "qcom,pm8450-rpmh-regulators",

		.data = pm8450_vreg_data,

	},

	{

		.compatible = "qcom,pm8550-rpmh-regulators",

		.data = pm8550_vreg_data,

	},

	{

		.compatible = "qcom,pm8550ve-rpmh-regulators",

		.data = pm8550ve_vreg_data,

	},

	{

		.compatible = "qcom,pm8550vs-rpmh-regulators",

		.data = pm8550vs_vreg_data,

	},

	{

		.compatible = "qcom,pm8998-rpmh-regulators",

		.data = pm8998_vreg_data,