Commit 66b19647 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

[ARM] mmp: enable L2 in mmp2 



Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent e5988636

arch/arm/configs/mmp2_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_ICACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

CONFIG_OUTER_CACHE=y

CONFIG_CACHE_TAUROS2=y

CONFIG_ARM_L1_CACHE_SHIFT=5

# CONFIG_ARM_ERRATA_411920 is not set

CONFIG_COMMON_CLKDEV=y

arch/arm/mach-mmp/mmp2.c

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include <linux/init.h>

#include <linux/io.h>



#include <asm/hardware/cache-tauros2.h>



#include <mach/addr-map.h>

#include <mach/regs-apbc.h>

#include <mach/regs-apmu.h>
@@ -99,6 +101,9 @@ static struct clk_lookup mmp2_clkregs[] = { 
static int __init mmp2_init(void)

{

	if (cpu_is_mmp2()) {

#ifdef CONFIG_CACHE_TAUROS2

		tauros2_init();

#endif

		mfp_init_base(MFPR_VIRT_BASE);

		mfp_init_addr(mmp2_addr_map);

		clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));

arch/arm/mm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ config CACHE_L2X0 


config CACHE_TAUROS2

	bool "Enable the Tauros2 L2 cache controller"

	depends on ARCH_DOVE

	depends on (ARCH_DOVE || ARCH_MMP)

	default y

	select OUTER_CACHE

	help