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

Merge series "regulator: fix pm8009 bindings on sm8250" from Dmitry Baryshkov... 

Merge series "regulator: fix pm8009 bindings on sm8250" from Dmitry Baryshkov <dmitry.baryshkov@linaro.org>:

PM8009 has special revision (P=1), which is to be used for sm8250
platform. The major difference is the S2 regulator which supplies 0.95 V
instead of 2.848V. Declare regulators data to be used for this chip
revision. The datasheet calls the chip just pm8009-1, so use the same
name.

base-commit: 5c8fe583
parents 90cf443d c3da0242

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"

arch/arm64/boot/dts/qcom/qrb5165-rb5.dts

+8 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ vreg_s4a_1p8: vreg-s4a-1p8 { 


&apps_rsc {

	pm8009-rpmh-regulators {

		compatible = "qcom,pm8009-rpmh-regulators";

		compatible = "qcom,pm8009-1-rpmh-regulators";

		qcom,pmic-id = "f";



		vdd-s1-supply = <&vph_pwr>;
@@ -131,6 +131,13 @@ pm8009-rpmh-regulators { 
		vdd-l5-l6-supply = <&vreg_bob>;

		vdd-l7-supply = <&vreg_s4a_1p8>;



		vreg_s2f_0p95: smps2 {

			regulator-name = "vreg_s2f_0p95";

			regulator-min-microvolt = <900000>;

			regulator-max-microvolt = <952000>;

			regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;

		};



		vreg_l1f_1p1: ldo1 {

			regulator-name = "vreg_l1f_1p1";

			regulator-min-microvolt = <1104000>;

drivers/regulator/qcom-rpmh-regulator.c

+27 −1
Original line number Diff line number Diff line
@@ -726,7 +726,16 @@ 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,

};



static const struct rpmh_vreg_hw_data pmic5_hfsmps515_1 = {

	.regulator_type = VRM,

	.ops = &rpmh_regulator_vrm_ops,

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

	.n_voltages = 5,

	.pmic_mode_map = pmic_mode_map_pmic5_smps,

	.of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode,
@@ -932,6 +941,19 @@ static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { 
	{},

};



static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = {

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

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

	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"),

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

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

	RPMH_VREG("ldo6",   "ldo%s6",  &pmic5_pldo,      "vdd-l5-l6"),

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

	{},

};



static const struct rpmh_vreg_init_data pm6150_vreg_data[] = {

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

	RPMH_VREG("smps2",  "smp%s2",  &pmic5_ftsmps510, "vdd-s2"),
@@ -1057,6 +1079,10 @@ static const struct of_device_id __maybe_unused rpmh_regulator_match_table[] = { 
		.compatible = "qcom,pm8009-rpmh-regulators",

		.data = pm8009_vreg_data,

	},

	{

		.compatible = "qcom,pm8009-1-rpmh-regulators",

		.data = pm8009_1_vreg_data,

	},

	{

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

		.data = pm8150_vreg_data,