diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:19:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:19:26 -0400 |
commit | 73c583e4e2dd0fbbf2fafe0cc57ff75314fe72df (patch) | |
tree | b2fb05a6d199c0f6653fff84b67159af8f228760 /arch/arm/plat-omap/Kconfig | |
parent | 5ce00289875a853280985aee671258795b77e089 (diff) | |
parent | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (diff) |
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (47 commits)
OMAP clock: use debugfs_remove_recursive() for rewinding
OMAP2/3/4 core: create omap_device layer
OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects
OMAP2/3/4: create omap_hwmod layer
OMAP2/3 board-*.c files: read bootloader configuration earlier
OMAP2/3/4 PRCM: add module IDLEST wait code
OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer
OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm
OMAP clock: associate MPU clocks with the mpu_clkdm
OMAP3 clock: Fixed processing of bootarg 'mpurate'
OMAP: SDRC: Add several new register definitions
OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups.
OMAP: PM: Added suspend target state control to debugfs for OMAP3
OMAP: PM debug: Add PRCM register dump support
OMAP: PM debug: make powerdomains use PM-debug counters
OMAP: PM: Add pm-debug counters
OMAP: PM: Add closures to clkdm_for_each and pwrdm_for_each.
OMAP: PM: Hook into PM counters
OMAP: PM counter infrastructure.
OMAP3: PM: fix lockdep warning caused by omap3_pm_init
...
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index efe85d095190..64b3f52bd9b2 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -120,6 +120,10 @@ config OMAP_MBOX_FWK | |||
120 | config OMAP_IOMMU | 120 | config OMAP_IOMMU |
121 | tristate | 121 | tristate |
122 | 122 | ||
123 | config OMAP_IOMMU_DEBUG | ||
124 | depends on OMAP_IOMMU | ||
125 | tristate | ||
126 | |||
123 | choice | 127 | choice |
124 | prompt "System timer" | 128 | prompt "System timer" |
125 | default OMAP_MPU_TIMER | 129 | default OMAP_MPU_TIMER |
@@ -183,6 +187,19 @@ config OMAP_SERIAL_WAKE | |||
183 | to data on the serial RX line. This allows you to wake the | 187 | to data on the serial RX line. This allows you to wake the |
184 | system from serial console. | 188 | system from serial console. |
185 | 189 | ||
190 | choice | ||
191 | prompt "OMAP PM layer selection" | ||
192 | depends on ARCH_OMAP | ||
193 | default OMAP_PM_NOOP | ||
194 | |||
195 | config OMAP_PM_NONE | ||
196 | bool "No PM layer" | ||
197 | |||
198 | config OMAP_PM_NOOP | ||
199 | bool "No-op/debug PM layer" | ||
200 | |||
201 | endchoice | ||
202 | |||
186 | endmenu | 203 | endmenu |
187 | 204 | ||
188 | endif | 205 | endif |