From: Russell King Date: Wed, 24 Aug 2011 07:14:17 +0000 (+0100) Subject: Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v' and 'pgt... X-Git-Tag: next-20110825~97^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=683b02fb5f63a1603acf292ae401a4ecdf88fae1;p=karo-tx-linux.git Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v' and 'pgt' into for-next --- 683b02fb5f63a1603acf292ae401a4ecdf88fae1 diff --cc arch/arm/Kconfig index 2c71a8f3535a,3269576dbfa8,2c71a8f3535a,2c71a8f3535a,ac1ba259c07f,272eadc7a12c,5ebc5d922ea1..63cbd866453b --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@@@@@@ -195,8 -195,7 -195,8 -195,8 -195,8 -195,8 -195,7 +195,8 @@@@@@@@ config VECTORS_BAS The base address of exception vectors. config ARM_PATCH_PHYS_VIRT - --- bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)" - --- depends on EXPERIMENTAL - - bool "Patch physical to virtual translations at runtime" +++++ + bool "Patch physical to virtual translations at runtime" if EMBEDDED +++++ + default y depends on !XIP_KERNEL && MMU depends on !ARCH_REALVIEW || !SPARSEMEM help diff --cc arch/arm/include/asm/hardware/cache-l2x0.h index 16bd48031583,bfa706ffd968,16bd48031583,16bd48031583,8fe149f2fcf3,16bd48031583,16bd48031583..4a6004a86a12 --- a/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/arch/arm/include/asm/hardware/cache-l2x0.h @@@@@@@@ -62,9 -62,9 -62,9 -62,9 -64,17 -62,9 -62,9 +64,17 @@@@@@@@ #define L2X0_CACHE_ID_PART_L310 (3 << 6) #define L2X0_AUX_CTRL_MASK 0xc0000fff ++++ ++#define L2X0_AUX_CTRL_DATA_RD_LATENCY_SHIFT 0 ++++ ++#define L2X0_AUX_CTRL_DATA_RD_LATENCY_MASK 0x7 ++++ ++#define L2X0_AUX_CTRL_DATA_WR_LATENCY_SHIFT 3 ++++ ++#define L2X0_AUX_CTRL_DATA_WR_LATENCY_MASK (0x7 << 3) ++++ ++#define L2X0_AUX_CTRL_TAG_LATENCY_SHIFT 6 ++++ ++#define L2X0_AUX_CTRL_TAG_LATENCY_MASK (0x7 << 6) ++++ ++#define L2X0_AUX_CTRL_DIRTY_LATENCY_SHIFT 9 ++++ ++#define L2X0_AUX_CTRL_DIRTY_LATENCY_MASK (0x7 << 9) #define L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT 16 #define L2X0_AUX_CTRL_WAY_SIZE_SHIFT 17 - -----#define L2X0_AUX_CTRL_WAY_SIZE_MASK (0x3 << 17) + +++++#define L2X0_AUX_CTRL_WAY_SIZE_MASK (0x7 << 17) #define L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT 22 #define L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT 26 #define L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT 27