Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into...

[deliverable/linux.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0517f0c1581a71091539c5c1abe47473f4b789ef..518f0e40167a52bfeec463d20a8991954714dc7d 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -88,9 +88,9 @@ config ARCH_OMAP2PLUS
        select ARCH_HAS_BANDGAP
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_OMAP
-       select ARCH_REQUIRE_GPIOLIB
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
+       select GPIOLIB
        select MACH_OMAP_GENERIC
        select MEMORY
        select MFD_SYSCON
@@ -240,4 +240,12 @@ endmenu
 
 endif
 
+config OMAP5_ERRATA_801819
+       bool "Errata 801819: An eviction from L1 data cache might stall indefinitely"
+       depends on SOC_OMAP5 || SOC_DRA7XX
+       help
+         A livelock can occur in the L2 cache arbitration that might prevent
+         a snoop from completing. Under certain conditions this can cause the
+         system to deadlock.
+
 endmenu