diff options
| author | Linus Torvalds | 2011-07-27 02:42:18 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-07-27 02:42:18 +0200 |
| commit | b0189cd087aa82bd23277cb5c8960ab030e13e5c (patch) | |
| tree | 7b1a4c152cd62ce136fd5b0e4379d58eb2244e66 /drivers/mfd/Kconfig | |
| parent | Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branches 'omap/prcm' and 'omap/mfd' of git+ssh://master.kernel.org/pub/... (diff) | |
| download | kernel-qcow2-linux-b0189cd087aa82bd23277cb5c8960ab030e13e5c.tar.gz kernel-qcow2-linux-b0189cd087aa82bd23277cb5c8960ab030e13e5c.tar.xz kernel-qcow2-linux-b0189cd087aa82bd23277cb5c8960ab030e13e5c.zip | |
Merge branch 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
OMAP: Add debugfs node to show the summary of all clocks
OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
OMAP2+: PM: idle clkdms only if already in idle
OMAP2+: clockdomain: add clkdm_in_hwsup()
OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
OMAP4: hwmod: Introduce the module control in hwmod control
OMAP4: cm: Add two new APIs for modulemode control
OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
OMAP4: hwmod data: Add PRM context register offset
OMAP4: prm: Remove deprecated functions
OMAP4: prm: Replace warm reset API with the offset based version
OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
OMAP: hwmod: Wait the idle status to be disabled
OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
OMAP2+: hwmod: Init clkdm field at boot time
OMAP4: hwmod data: Add clock domain attribute
OMAP4: clock data: Add missing divider selection for auxclks
...
Diffstat (limited to 'drivers/mfd/Kconfig')
| -rw-r--r-- | drivers/mfd/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 6ca938a6bf94..37b83eb6d703 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -218,7 +218,7 @@ config TWL4030_POWER and load scripts controlling which resources are switched off/on or reset when a sleep, wakeup or warm reset event occurs. -config TWL4030_CODEC +config MFD_TWL4030_AUDIO bool depends on TWL4030_CORE select MFD_CORE @@ -233,6 +233,12 @@ config TWL6030_PWM Say yes here if you want support for TWL6030 PWM. This is used to control charging LED brightness. +config TWL6040_CORE + bool + depends on TWL4030_CORE && GENERIC_HARDIRQS + select MFD_CORE + default n + config MFD_STMPE bool "Support STMicroelectronics STMPE" depends on I2C=y && GENERIC_HARDIRQS |