Merge tag 'regulator-fix-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown: "The set of regulators described for the Qualcomm PM8550 just seems to have been completely wrong and would likely not have worked at all if anything tried to actually configure anything except for enabling and disabling at runtime" * tag 'regulator-fix-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: qcom-rpmh: Fix regulators for PM8550

Linus Torvalds committed 3 years ago

Commit eee71c32 parents 231a1e3 b00de001 file · +15 −15Browse files

Unified · Split

drivers/regulator/qcom-rpmh-regulator.c+15−15

@@ -1057,21 +1057,21 @@ static const struct rpmh_vreg_init_data pm8450_vreg_data[] = { · 1056 unmodified lines
1057	};	1057	};
1058		1058
1059	static const struct rpmh_vreg_init_data pm8550_vreg_data[] = {	1059	static const struct rpmh_vreg_init_data pm8550_vreg_data[] = {
1060	RPMH_VREG("ldo1", "ldo%s1", &pmic5_pldo, "vdd-l1-l4-l10"),	1060	RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo515, "vdd-l1-l4-l10"),
1061	RPMH_VREG("ldo2", "ldo%s2", &pmic5_pldo, "vdd-l2-l13-l14"),	1061	RPMH_VREG("ldo2", "ldo%s2", &pmic5_pldo, "vdd-l2-l13-l14"),
1062	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3"),	1062	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo515, "vdd-l3"),
1063	RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l1-l4-l10"),	1063	RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo515, "vdd-l1-l4-l10"),
1064	RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l16"),	1064	RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l16"),
1065	RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo_lv, "vdd-l6-l7"),	1065	RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l6-l7"),
1066	RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l6-l7"),	1066	RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l6-l7"),
1067	RPMH_VREG("ldo8", "ldo%s8", &pmic5_pldo_lv, "vdd-l8-l9"),	1067	RPMH_VREG("ldo8", "ldo%s8", &pmic5_pldo, "vdd-l8-l9"),
1068	RPMH_VREG("ldo9", "ldo%s9", &pmic5_pldo, "vdd-l8-l9"),	1068	RPMH_VREG("ldo9", "ldo%s9", &pmic5_pldo, "vdd-l8-l9"),
1069	RPMH_VREG("ldo10", "ldo%s10", &pmic5_nldo, "vdd-l1-l4-l10"),	1069	RPMH_VREG("ldo10", "ldo%s10", &pmic5_nldo515, "vdd-l1-l4-l10"),
1070	RPMH_VREG("ldo11", "ldo%s11", &pmic5_nldo, "vdd-l11"),	1070	RPMH_VREG("ldo11", "ldo%s11", &pmic5_nldo515, "vdd-l11"),
1071	RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo, "vdd-l12"),	1071	RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo, "vdd-l12"),
1072	RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l2-l13-l14"),	1072	RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l2-l13-l14"),
1073	RPMH_VREG("ldo14", "ldo%s14", &pmic5_pldo, "vdd-l2-l13-l14"),	1073	RPMH_VREG("ldo14", "ldo%s14", &pmic5_pldo, "vdd-l2-l13-l14"),
1074	RPMH_VREG("ldo15", "ldo%s15", &pmic5_pldo, "vdd-l15"),	1074	RPMH_VREG("ldo15", "ldo%s15", &pmic5_nldo515, "vdd-l15"),
1075	RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l5-l16"),	1075	RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l5-l16"),
1076	RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l17"),	1076	RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l17"),
1077	RPMH_VREG("bob1", "bob%s1", &pmic5_bob, "vdd-bob1"),	1077	RPMH_VREG("bob1", "bob%s1", &pmic5_bob, "vdd-bob1"),
@@ -1086,9 +1086,9 @@ static const struct rpmh_vreg_init_data pm8550vs_vreg_data[] = { · 8 unmodified lines
1086	RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps525_lv, "vdd-s4"),	1086	RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps525_lv, "vdd-s4"),
1087	RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps525_lv, "vdd-s5"),	1087	RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps525_lv, "vdd-s5"),
1088	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_mv, "vdd-s6"),	1088	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_mv, "vdd-s6"),
1089	RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1"),	1089	RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo515, "vdd-l1"),
1090	RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2"),	1090	RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo515, "vdd-l2"),
1091	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3"),	1091	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo515, "vdd-l3"),
1092	{}	1092	{}
1093	};	1093	};
1094		1094
@@ -1101,9 +1101,9 @@ static const struct rpmh_vreg_init_data pm8550ve_vreg_data[] = { · 6 unmodified lines
1101	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_lv, "vdd-s6"),	1101	RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps525_lv, "vdd-s6"),
1102	RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps525_lv, "vdd-s7"),	1102	RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps525_lv, "vdd-s7"),
1103	RPMH_VREG("smps8", "smp%s8", &pmic5_ftsmps525_lv, "vdd-s8"),	1103	RPMH_VREG("smps8", "smp%s8", &pmic5_ftsmps525_lv, "vdd-s8"),
1104	RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1"),	1104	RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo515, "vdd-l1"),
1105	RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2"),	1105	RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo515, "vdd-l2"),
1106	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3"),	1106	RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo515, "vdd-l3"),
1107	{}	1107	{}
1108	};	1108	};
1109		1109