Commit 9fb90804 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'ib-mfd-tps6594-core-v6.5' of... 

Merge tag 'ib-mfd-tps6594-core-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

 into char-misc-next

Immutable branch containing TPS6594 core (MFD) support due for the v6.5 merge window

We want this due to patches requiring this mfd support.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

* tag 'ib-mfd-tps6594-core-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: tps6594: Add driver for TI TPS6594 PMIC
parents e04b1bff 325bec71

drivers/mfd/Kconfig

+32 −0
Original line number Diff line number Diff line
@@ -1679,6 +1679,38 @@ config MFD_TPS65912_SPI 
	  If you say yes here you get support for the TPS65912 series of

	  PM chips with SPI interface.



config MFD_TPS6594

	tristate

	select MFD_CORE

	select REGMAP

	select REGMAP_IRQ



config MFD_TPS6594_I2C

	tristate "TI TPS6594 Power Management chip with I2C"

	select MFD_TPS6594

	select REGMAP_I2C

	select CRC8

	depends on I2C

	help

	  If you say yes here you get support for the TPS6594 series of

	  PM chips with I2C interface.



	  This driver can also be built as a module.  If so, the module

	  will be called tps6594-i2c.



config MFD_TPS6594_SPI

	tristate "TI TPS6594 Power Management chip with SPI"

	select MFD_TPS6594

	select REGMAP_SPI

	select CRC8

	depends on SPI_MASTER

	help

	  If you say yes here you get support for the TPS6594 series of

	  PM chips with SPI interface.



	  This driver can also be built as a module.  If so, the module

	  will be called tps6594-spi.



config TWL4030_CORE

	bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support"

	depends on I2C=y

drivers/mfd/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ obj-$(CONFIG_MFD_TPS65910) += tps65910.o 
obj-$(CONFIG_MFD_TPS65912)	+= tps65912-core.o

obj-$(CONFIG_MFD_TPS65912_I2C)	+= tps65912-i2c.o

obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o

obj-$(CONFIG_MFD_TPS6594)	+= tps6594-core.o

obj-$(CONFIG_MFD_TPS6594_I2C)	+= tps6594-i2c.o

obj-$(CONFIG_MFD_TPS6594_SPI)	+= tps6594-spi.o

obj-$(CONFIG_MENELAUS)		+= menelaus.o



obj-$(CONFIG_TWL4030_CORE)	+= twl-core.o twl4030-irq.o twl6030-irq.o

drivers/mfd/tps6594-core.c

0 → 100644
+462 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mfd/tps6594-i2c.c

0 → 100644
+244 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mfd/tps6594-spi.c

0 → 100644
+129 −0

File added.

Preview size limit exceeded, changes collapsed.