Merge branch 'exynos/dt' into late/dt

[karo-tx-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8ffab890d7aab0f424ea4eb440efd8501355dedd..be23497f5b2982b7c6c61bcfbe0324176a4c8ccc 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1189,9 +1189,9 @@ config ARM_NR_BANKS
        default 8
 
 config IWMMXT
        default 8
 
 config IWMMXT

-       bool "Enable iWMMXt support"
+       bool "Enable iWMMXt support" if !CPU_PJ4

        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4
        depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

-       default y if PXA27x || PXA3xx || ARCH_MMP
+       default y if PXA27x || PXA3xx || ARCH_MMP || CPU_PJ4

        help
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.
        help
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.


@@ -1445,6 +1445,16 @@ config ARM_ERRATA_775420
         to deadlock. This workaround puts DSB before executing ISB if
         an abort may occur on cache maintenance.
 
         to deadlock. This workaround puts DSB before executing ISB if
         an abort may occur on cache maintenance.
 

+config ARM_ERRATA_798181
+       bool "ARM errata: TLBI/DSB failure on Cortex-A15"
+       depends on CPU_V7 && SMP
+       help
+         On Cortex-A15 (r0p0..r3p2) the TLBI*IS/DSB operations are not
+         adequately shooting down all use of the old entries. This
+         option enables the Linux kernel workaround for this erratum
+         which sends an IPI to the CPUs that are running the same ASID
+         as the one being invalidated.
+

 endmenu
 
 source "arch/arm/common/Kconfig"
 endmenu
 
 source "arch/arm/common/Kconfig"