Skip to content

Commit 2ff59ba

Browse files
committed
Merge tag 'regulator-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "A couple of small device specific fixes that have been sent since the merge window, neither of which stands out particularly" * tag 'regulator-fix-v5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: max14577: Revert "regulator: max14577: Add proper module aliases strings" regulator: qcom-rpmh-regulator: fix pm8009-1 ldo7 resource name
2 parents e8f71f8 + dc96605 commit 2ff59ba

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/regulator/max14577-regulator.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,3 @@ module_exit(max14577_regulator_exit);
269269
MODULE_AUTHOR("Krzysztof Kozlowski <[email protected]>");
270270
MODULE_DESCRIPTION("Maxim 14577/77836 regulator driver");
271271
MODULE_LICENSE("GPL");
272-
MODULE_ALIAS("platform:max14577-regulator");
273-
MODULE_ALIAS("platform:max77836-regulator");

drivers/regulator/qcom-rpmh-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ static const struct rpmh_vreg_init_data pm8009_1_vreg_data[] = {
991991
RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l4"),
992992
RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"),
993993
RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"),
994-
RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"),
994+
RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo_lv, "vdd-l7"),
995995
{}
996996
};
997997

0 commit comments

Comments
 (0)