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.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl+kBncACgkQJNaLcl1U
 h9DHMQf9FzSHbhdl2h3d0quiZF88H4ukXgkHRJJeqCsVv7kTekGgui3KEB19x5+3
 rATP2AMt9aF9bG9YCWt2VazrbvJQ7hSmHq9NlrbaM2UZJW/12lKJ6v33xJWSxhTl
 kGPhNirbNaxZ1B4SJJiiBX59puSTbaOj9JwI9MlR+8gxqE+Mk42Qz2UHNUINB3At
 g9zuHXts+Iure4D18vBZcu/Vcrs3x8HMYtYsZgskT6fgvt/AsHCQ8yYUP6sB2EIN
 h7msMvAxSwAGOBcLx6wDM3azcxz5SvAr5WeoXaMrDfUMWH2TGlTuIVhq4uXqrAVu
 twG4JNCLV66YE4gILSGu7FdRauOOfg==
 =0T87
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2020-11-05 11:11:40 -08:00
Родитель f786dfa374 cf1ad559a2
Коммит 3d55978f95
2 изменённых файлов: 10 добавлений и 0 удалений

Просмотреть файл

@ -14527,6 +14527,14 @@ F: Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
F: drivers/mailbox/qcom-ipcc.c
F: include/dt-bindings/mailbox/qcom-ipcc.h
QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
M: Robert Marko <robert.marko@sartura.hr>
M: Luka Perkov <luka.perkov@sartura.hr>
L: linux-arm-msm@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
F: drivers/regulator/vqmmc-ipq4019-regulator.c
QUALCOMM RMNET DRIVER
M: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
M: Sean Tranchetti <stranche@codeaurora.org>

Просмотреть файл

@ -4165,6 +4165,8 @@ int regulator_get_voltage_rdev(struct regulator_dev *rdev)
ret = rdev->desc->fixed_uV;
} else if (rdev->supply) {
ret = regulator_get_voltage_rdev(rdev->supply->rdev);
} else if (rdev->supply_name) {
return -EPROBE_DEFER;
} else {
return -EINVAL;
}