regulator: Regulator driver for the Qualcomm RPM

Driver for regulators exposed by the Resource Power Manager (RPM) found
in devices based on Qualcomm 8974 and newer platforms.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: Andy Gross <agross@codeaurora.org>
Tested-by: Tim Bird <tim.bird@sonymobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index bef3bde..79c3f6d 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -522,6 +522,18 @@ config REGULATOR_QCOM_RPM
          Qualcomm RPM as a module. The module will be named
          "qcom_rpm-regulator".
 
+config REGULATOR_QCOM_SMD_RPM
+       tristate "Qualcomm SMD based RPM regulator driver"
+       depends on QCOM_SMD_RPM
+       help
+         If you say yes to this option, support will be included for the
+         regulators exposed by the Resource Power Manager found in Qualcomm
+         8974 based devices.
+
+         Say M here if you want to include support for the regulators on the
+         Qualcomm RPM as a module. The module will be named
+         "qcom_smd-regulator".
+
 config REGULATOR_QCOM_SPMI
        tristate "Qualcomm SPMI regulator driver"
        depends on SPMI || COMPILE_TEST

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 91bf762..abf70a7 100644 (file)
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
 obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
+obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_SPMI) += qcom_spmi-regulator.o
 obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
 obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o

diff --cc drivers/regulator/qcom_smd-regulator.c
Simple merge