Commit 507614ba authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

regulator: hi6421v600-regulator: move it from staging

parent 45bca188
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -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
+1 −0
Original line number Diff line number Diff line
@@ -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
+0 −11
Original line number Diff line number Diff line
@@ -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.
+0 −1
Original line number Diff line number Diff line
@@ -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