diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-04-03 04:56:51 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-04-16 10:45:34 -0400 |
commit | 8eaeb9393397be8eb700ab38a69c450975463b77 (patch) | |
tree | 1f6b9d8d8197b16c19ed0ed03d55886e0c519ba5 /drivers/mfd/Kconfig | |
parent | 4accdff7a3e397b43e50f605ee561ba7994745c7 (diff) |
mfd: Convert twl6040 to i2c driver, and separate it from twl core
Complete the separation of the twl6040 from the twl core since
it is a separate chip, not part of the twl6030 PMIC.
Make the needed Kconfig changes for the depending drivers at the
same time to avoid breaking the kernel build (vibra, ASoC components).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/Kconfig')
-rw-r--r-- | drivers/mfd/Kconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 29f463cc09cb..11e44386fa9b 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -268,10 +268,17 @@ config TWL6030_PWM | |||
268 | This is used to control charging LED brightness. | 268 | This is used to control charging LED brightness. |
269 | 269 | ||
270 | config TWL6040_CORE | 270 | config TWL6040_CORE |
271 | bool | 271 | bool "Support for TWL6040 audio codec" |
272 | depends on TWL4030_CORE && GENERIC_HARDIRQS | 272 | depends on I2C=y && GENERIC_HARDIRQS |
273 | select MFD_CORE | 273 | select MFD_CORE |
274 | select REGMAP_I2C | ||
274 | default n | 275 | default n |
276 | help | ||
277 | Say yes here if you want support for Texas Instruments TWL6040 audio | ||
278 | codec. | ||
279 | This driver provides common support for accessing the device, | ||
280 | additional drivers must be enabled in order to use the | ||
281 | functionality of the device (audio, vibra). | ||
275 | 282 | ||
276 | config MFD_STMPE | 283 | config MFD_STMPE |
277 | bool "Support STMicroelectronics STMPE" | 284 | bool "Support STMicroelectronics STMPE" |