diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-01-18 15:05:06 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-01-18 15:05:06 -0800 |
| commit | 7b85fb28edcd86cde9a265c763ada1b2be366f55 (patch) | |
| tree | c1e3a86e7b67e91b404e4d893146d4652d29fcab /arch/arm/mach-omap2/Kconfig | |
| parent | 8f88cb4cab5eeab21c14360e54ea5a29e4e8efed (diff) | |
| parent | 817c7dd8532bb5129550f912bd82a14bd088b362 (diff) | |
| download | kernel_samsung_tuna-7b85fb28edcd86cde9a265c763ada1b2be366f55.zip kernel_samsung_tuna-7b85fb28edcd86cde9a265c763ada1b2be366f55.tar.gz kernel_samsung_tuna-7b85fb28edcd86cde9a265c763ada1b2be366f55.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Conflicts:
arch/arm/mach-omap2/Kconfig
Change-Id: I43e69654c80590b971018903ae00fc7fa2ea5cc7
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index fe0bed4..f7b228c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -363,6 +363,23 @@ config OMAP_FIQ_DEBUGGER help Enables the serial FIQ debugger on OMAP" +config OMAP4_PPA_CPU1_ONLINE_BUG + bool "Enable Support for CPU1 ONLINE WA for OSWR/OFF" + depends on ARCH_OMAP4 + depends on OMAP_ALLOW_OSWR + default y + help + If an non GP OMAP4 device is used and PPA revision is < v1.7.3, + the device does not perform the memory maintenance and TLB sync + operations required before releasing CPU1 to HLOS. This results + in crash while resuming from OFF mode. + + Disable this option *ONLY IF* you meet the minimum PPA version + requirement. + + If, on the other hand, you do not understand the change, leave the + default as enabled. + endmenu endif |