tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds a483ab1d eba966a4

+14
unified split
+12
drivers/mfd/Kconfig
··· 103 103 help 104 104 Support for Toshiba Mobile IO Controller TC6393XB 105 105 106 + config PMIC_DA903X 107 + bool "Dialog Semiconductor DA9030/DA9034 PMIC Support" 108 + depends on I2C=y 109 + help 110 + Say yes here to support for Dialog Semiconductor DA9030 (a.k.a 111 + ARAVA) and DA9034 (a.k.a MICCO), these are Power Management IC 112 + usually found on PXA processors-based platforms. This includes 113 + the I2C driver and the core APIs _only_, you have to select 114 + individual components like LCD backlight, voltage regulators, 115 + LEDs and battery-charger under the corresponding menus. 116 + 106 117 config MFD_WM8400 107 118 tristate "Support Wolfson Microelectronics WM8400" 119 + depends on I2C 108 120 help 109 121 Support for the Wolfson Microelecronics WM8400 PMIC and audio 110 122 CODEC. This driver adds provides common support for accessing
+2
drivers/mfd/Makefile
··· 30 30 obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o 31 31 endif 32 32 obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o 33 + 34 + obj-$(CONFIG_PMIC_DA903X) += da903x.o