Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54f323b1 authored by Linus Walleij's avatar Linus Walleij Committed by Samuel Ortiz
Browse files

mfd: Move TPS55910 Kconfig option 



Having another TPS chip at the end of the Kconfig when all it's
relatives are grouped together in their own section seems totally
counter-intuitive. Move it, also in the Makefile.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 4dcaa6b6

drivers/mfd/Kconfig

+9 −9
Original line number Diff line number Diff line
@@ -171,6 +171,15 @@ config MFD_TPS6586X 
	  This driver can also be built as a module.  If so, the module

	  will be called tps6586x.



config MFD_TPS65910

	bool "TPS65910 Power Management chip"

	depends on I2C=y && GPIOLIB

	select MFD_CORE

	select GPIO_TPS65910

	help

	  if you say yes here you get support for the TPS65910 series of

	  Power Management chips.



config MFD_TPS65912

	bool

	depends on GPIOLIB
@@ -748,15 +757,6 @@ config MFD_PM8XXX_IRQ 
	  This is required to use certain other PM 8xxx features, such as GPIO

	  and MPP.



config MFD_TPS65910

	bool "TPS65910 Power Management chip"

	depends on I2C=y && GPIOLIB

	select MFD_CORE

	select GPIO_TPS65910

	help

	  if you say yes here you get support for the TPS65910 series of

	  Power Management chips.



config TPS65911_COMPARATOR

	tristate

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_MFD_WM8994) += wm8994-core.o wm8994-irq.o 
obj-$(CONFIG_TPS6105X)		+= tps6105x.o

obj-$(CONFIG_TPS65010)		+= tps65010.o

obj-$(CONFIG_TPS6507X)		+= tps6507x.o

obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-irq.o

tps65912-objs                   := tps65912-core.o tps65912-irq.o

obj-$(CONFIG_MFD_TPS65912)	+= tps65912.o

obj-$(CONFIG_MFD_TPS65912_I2C)	+= tps65912-i2c.o
@@ -99,5 +100,4 @@ obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o 
obj-$(CONFIG_MFD_OMAP_USB_HOST)	+= omap-usb-host.o

obj-$(CONFIG_MFD_PM8921_CORE) 	+= pm8921-core.o

obj-$(CONFIG_MFD_PM8XXX_IRQ) 	+= pm8xxx-irq.o

obj-$(CONFIG_MFD_TPS65910)	+= tps65910.o tps65910-irq.o

obj-$(CONFIG_TPS65911_COMPARATOR)	+= tps65911-comparator.o