Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 33 insertions, 2 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index a6230f7a24c8..20979564e7ee 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -186,6 +186,24 @@ config CPU_ARM926T
           Say Y if you want support for the ARM926T processor.
           Otherwise, say N.
 
+# FA526
+config CPU_FA526
+        bool
+        select CPU_32v4
+        select CPU_ABRT_EV4
+        select CPU_PABRT_NOIFAR
+        select CPU_CACHE_VIVT
+        select CPU_CP15_MMU
+        select CPU_CACHE_FA
+        select CPU_COPY_FA if MMU
+        select CPU_TLB_FA if MMU
+        help
+          The FA526 is a version of the ARMv4 compatible processor with
+          Branch Target Buffer, Unified TLB and cache line size 16.
+
+          Say Y if you want support for the FA526 processor.
+          Otherwise, say N.
+
 # ARM940T
 config CPU_ARM940T
         bool "Support ARM940T processor" if ARCH_INTEGRATOR
@@ -495,6 +513,9 @@ config CPU_CACHE_VIVT
 config CPU_CACHE_VIPT
         bool
 
+config CPU_CACHE_FA
+        bool
+
 if MMU
 # The copy-page model
 config CPU_COPY_V3
@@ -509,6 +530,9 @@ config CPU_COPY_V4WB
 config CPU_COPY_FEROCEON
         bool
 
+config CPU_COPY_FA
+        bool
+
 config CPU_COPY_V6
         bool
 
@@ -539,6 +563,13 @@ config CPU_TLB_FEROCEON
         help
           Feroceon TLB (v4wbi with non-outer-cachable page table walks).
 
+config CPU_TLB_FA
+        bool
+        help
+          Faraday ARM FA526 architecture, unified TLB with writeback cache
+          and invalidate instruction cache entry. Branch target buffer is
+          also supported.
+
 config CPU_TLB_V6
         bool
 
@@ -649,7 +680,7 @@ config CPU_DCACHE_SIZE
 
 config CPU_DCACHE_WRITETHROUGH
         bool "Force write through D-cache"
-        depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE
+        depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FA526) && !CPU_DCACHE_DISABLE
         default y if CPU_ARM925T
         help
           Say Y here to use the data cache in writethrough mode. Unless you
@@ -664,7 +695,7 @@ config CPU_CACHE_ROUND_ROBIN
 
 config CPU_BPREDICT_DISABLE
         bool "Disable branch prediction"
-        depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7
+        depends on CPU_ARM1020 || CPU_V6 || CPU_MOHAWK || CPU_XSC3 || CPU_V7 || CPU_FA526
         help
           Say Y here to disable branch prediction.  If unsure, say N.