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

Commit a483ab1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd 

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: Make WM8400 depend on I2C until SPI is submitted
  mfd: add missing Kconfig entry for da903x
parents eba966a4 9c366452

drivers/mfd/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -103,8 +103,20 @@ config MFD_TC6393XB 
	help

	  Support for Toshiba Mobile IO Controller TC6393XB



config PMIC_DA903X

	bool "Dialog Semiconductor DA9030/DA9034 PMIC Support"

	depends on I2C=y

	help

	  Say yes here to support for Dialog Semiconductor DA9030 (a.k.a

	  ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC

	  usually found on PXA processors-based platforms. This includes

	  the I2C driver and the core APIs _only_, you have to select

	  individual components like LCD backlight, voltage regulators,

	  LEDs and battery-charger under the corresponding menus.



config MFD_WM8400

	tristate "Support Wolfson Microelectronics WM8400"

	depends on I2C

	help

	  Support for the Wolfson Microelecronics WM8400 PMIC and audio

	  CODEC.  This driver adds provides common support for accessing

drivers/mfd/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -30,3 +30,5 @@ ifeq ($(CONFIG_SA1100_ASSABET),y) 
obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o

endif

obj-$(CONFIG_UCB1400_CORE)	+= ucb1400_core.o



obj-$(CONFIG_PMIC_DA903X)	+= da903x.o
 
 No newline at end of file