Commit 8da822e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v5.8-rc5' of... 

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
parents ee436955 412847fb

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/regulator/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/regulator/qcom_smd-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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" },

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE