regulator: hi6421v600-regulator: move it from staging

This driver is ready for mainstream. Move it out of staging.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/815b79a4e93f133478d9a5b2dd429526dcfe1dde.1616695231.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 77c4313..ea1d284 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -422,6 +422,15 @@ config REGULATOR_HI655X
          This driver provides support for the voltage regulators of the
          Hisilicon Hi655x PMIC device.
 
+config REGULATOR_HI6421V600
+       tristate "HiSilicon Hi6421v600 PMIC voltage regulator support"
+       depends on MFD_HI6421_SPMI && OF
+       select REGMAP
+       help
+         This driver provides support for the voltage regulators on
+         HiSilicon Hi6421v600 PMU / Codec IC.
+         This is used on Kirin 3670 boards, like HiKey 970.
+
 config REGULATOR_ISL9305
        tristate "Intersil ISL9305 regulator"
        depends on I2C

diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 44d2f8b..11c1458 100644 (file)
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_REGULATOR_FAN53880) += fan53880.o
 obj-$(CONFIG_REGULATOR_GPIO) += gpio-regulator.o
 obj-$(CONFIG_REGULATOR_HI6421) += hi6421-regulator.o
 obj-$(CONFIG_REGULATOR_HI6421V530) += hi6421v530-regulator.o
+obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o
 obj-$(CONFIG_REGULATOR_HI655X) += hi655x-regulator.o
 obj-$(CONFIG_REGULATOR_ISL6271A) += isl6271a-regulator.o
 obj-$(CONFIG_REGULATOR_ISL9305) += isl9305.o

diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/regulator/hi6421v600-regulator.c
similarity index 100%
rename from drivers/staging/hikey9xx/hi6421v600-regulator.c
rename to drivers/regulator/hi6421v600-regulator.c

diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig
index 82bb4a2..c4dc101 100644 (file)
--- a/drivers/staging/hikey9xx/Kconfig
+++ b/drivers/staging/hikey9xx/Kconfig
@@ -39,14 +39,3 @@ config MFD_HI6421_SPMI
          individual components like voltage regulators under corresponding
          menus in order to enable them.
          We communicate with the Hi6421v600 via a SPMI bus.
-
-# to be placed at drivers/regulator
-config REGULATOR_HI6421V600
-       tristate "HiSilicon Hi6421v600 PMIC voltage regulator support"
-       depends on MFD_HI6421_SPMI && OF
-       depends on REGULATOR
-       select REGMAP
-       help
-         This driver provides support for the voltage regulators on
-         HiSilicon Hi6421v600 PMU / Codec IC.
-         This is used on Kirin 3670 boards, like HiKey 970.

diff --git a/drivers/staging/hikey9xx/Makefile b/drivers/staging/hikey9xx/Makefile
index 1924fad..9103735 100644 (file)
--- a/drivers/staging/hikey9xx/Makefile
+++ b/drivers/staging/hikey9xx/Makefile
@@ -4,4 +4,3 @@ obj-$(CONFIG_PHY_HI3670_USB)            += phy-hi3670-usb3.o
 
 obj-$(CONFIG_SPMI_HISI3670)            += hisi-spmi-controller.o
 obj-$(CONFIG_MFD_HI6421_SPMI)          += hi6421-spmi-pmic.o
-obj-$(CONFIG_REGULATOR_HI6421V600)     += hi6421v600-regulator.o