Skip to content

Commit 3d55978

Browse files
committed
Merge tag 'regulator-fix-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown: "An addition to MAINTAINERS plus a fix for a nasty bootstrapping problem which caused problems when we need to read the voltage of a regulator that is not yet available during initialization, we were not correctly distinguishing between this case and the case where a regulator is put into a bypass mode" * tag 'regulator-fix-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: defer probe when trying to get voltage from unresolved supply MAINTAINERS: Add entry for Qualcomm IPQ4019 VQMMC regulator
2 parents f786dfa + cf1ad55 commit 3d55978

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14527,6 +14527,14 @@ F: Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
1452714527
F: drivers/mailbox/qcom-ipcc.c
1452814528
F: include/dt-bindings/mailbox/qcom-ipcc.h
1452914529

14530+
QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
14531+
M: Robert Marko <robert.marko@sartura.hr>
14532+
M: Luka Perkov <luka.perkov@sartura.hr>
14533+
L: linux-arm-msm@vger.kernel.org
14534+
S: Maintained
14535+
F: Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
14536+
F: drivers/regulator/vqmmc-ipq4019-regulator.c
14537+
1453014538
QUALCOMM RMNET DRIVER
1453114539
M: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
1453214540
M: Sean Tranchetti <stranche@codeaurora.org>

drivers/regulator/core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4165,6 +4165,8 @@ int regulator_get_voltage_rdev(struct regulator_dev *rdev)
41654165
ret = rdev->desc->fixed_uV;
41664166
} else if (rdev->supply) {
41674167
ret = regulator_get_voltage_rdev(rdev->supply->rdev);
4168+
} else if (rdev->supply_name) {
4169+
return -EPROBE_DEFER;
41684170
} else {
41694171
return -EINVAL;
41704172
}

0 commit comments

Comments
 (0)