Unverified Commit 36836f5b authored by Mark Brown's avatar Mark Brown
Browse files

Merge qcom driver fix into regulator-5.11

parents d957d161 df6b92fa

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ First Level Nodes - PMIC 
	Definition: Must be one of below:

		    "qcom,pm8005-rpmh-regulators"

		    "qcom,pm8009-rpmh-regulators"

		    "qcom,pm8009-1-rpmh-regulators"

		    "qcom,pm8150-rpmh-regulators"

		    "qcom,pm8150l-rpmh-regulators"

		    "qcom,pm8350-rpmh-regulators"

drivers/regulator/qcom-rpmh-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { 
static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = {

	.regulator_type = VRM,

	.ops = &rpmh_regulator_vrm_ops,

	.voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 1600),

	.voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 16000),

	.n_voltages = 5,

	.pmic_mode_map = pmic_mode_map_pmic5_smps,

	.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,