UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: Fixes for v5.8 

The more substantial fix here is the rename of the da903x driver which
 fixes a collision with the parent MFD driver name which caused issues
 when things were built as modules.  There's also a fix for a mislableled
 regulator on the pmi8994 which is quite important for systems with that
 device.
 -----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl8RmrkTHGJyb29uaWVA
 a2VybmVsLm9yZwAKCRAk1otyXVSH0ANIB/43sHA61bYPIeyJ+TUKWTAaoEf4AluO
 I0lyo4AsnquLXD4/4gJi4d+rVBL7HF/Kyguq2y90VabtfuhddSb3B6PqLgr9+Ja8
 F/4iDGUjiMN3v3fCfkyLlYoou7KChJlWV0OQAsZ+W4KqX5l5qD4R+2pamx0RRzXJ
 2MYiRYQ98Ez/0eNaHe+rSOfBGpadYj8AfnwZFLHR5AAybZEMRo8lYd7oLdwCkpW/
 0ySgDjGWxzQKwhg7GBvrMxgaq4zHqfgOh34mfUBrbgF3SqD4UduSQ2iU12HepV1a
 w/No5YS+BcZoR6djEpK4T1SmHdy7C6HnOhiFzn3jBczMptxB+8Ae3yMZ
 =SXtn
 -----END PGP SIGNATURE-----

Merge tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into master

Pull regulator fixes from Mark Brown:
 "The more substantial fix here is the rename of the da903x driver which
  fixes a collision with the parent MFD driver name which caused issues
  when things were built as modules.

  There's also a fix for a mislableled regulator on the pmi8994 which is
  quite important for systems with that device"

* tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  MAINTAINERS: remove obsolete entry after file renaming
  regulator: rename da903x to da903x-regulator
  regulator: qcom_smd: Fix pmi8994 label
This commit is contained in:
Linus Torvalds 2020-07-17 10:20:26 -07:00
parent ee43695571 412847fb47
commit 8da822e8a5
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -5022,7 +5022,6 @@ F: drivers/mfd/da91??-*.c
F: drivers/pinctrl/pinctrl-da90??.c
F: drivers/power/supply/da9052-battery.c
F: drivers/power/supply/da91??-*.c
F: drivers/regulator/da903x.c
F: drivers/regulator/da9???-regulator.[ch]
F: drivers/regulator/slg51000-regulator.[ch]
F: drivers/rtc/rtc-da90??.c

2
drivers/regulator/Makefile
View File

@ -31,7 +31,7 @@ obj-$(CONFIG_REGULATOR_BD70528) += bd70528-regulator.o
obj-$(CONFIG_REGULATOR_BD71828) += bd71828-regulator.o
obj-$(CONFIG_REGULATOR_BD718XX) += bd718x7-regulator.o
obj-$(CONFIG_REGULATOR_BD9571MWV) += bd9571mwv-regulator.o
obj-$(CONFIG_REGULATOR_DA903X) += da903x.o
obj-$(CONFIG_REGULATOR_DA903X) += da903x-regulator.o
obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o
obj-$(CONFIG_REGULATOR_DA9055) += da9055-regulator.o
obj-$(CONFIG_REGULATOR_DA9062) += da9062-regulator.o

0
drivers/regulator/da903x.c → drivers/regulator/da903x-regulator.c
View File

2
drivers/regulator/qcom_smd-regulator.c
View File

@ -821,7 +821,7 @@ static const struct rpm_regulator_data rpm_pm8994_regulators[] = {
static const struct rpm_regulator_data rpm_pmi8994_regulators[] = {
{ "s1", QCOM_SMD_RPM_SMPB, 1, &pmi8994_ftsmps, "vdd_s1" },
{ "s2", QCOM_SMD_RPM_SMPB, 2, &pmi8994_hfsmps, "vdd_s2" },
{ "s2", QCOM_SMD_RPM_SMPB, 3, &pmi8994_hfsmps, "vdd_s3" },
{ "s3", QCOM_SMD_RPM_SMPB, 3, &pmi8994_hfsmps, "vdd_s3" },
{ "boost-bypass", QCOM_SMD_RPM_BBYB, 1, &pmi8994_bby, "vdd_bst_byp" },
{}
};