UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ARM] mmp: enable L2 in mmp2 

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

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Haojian Zhuang 2010-04-28 10:59:45 -04:00 committed by Eric Miao
parent e598863690
commit 66b1964750
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/mmp2_defconfig
View File

@ -246,6 +246,8 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_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_L1_CACHE_SHIFT=5
# CONFIG_ARM_ERRATA_411920 is not set # CONFIG_ARM_ERRATA_411920 is not set
CONFIG_COMMON_CLKDEV=y CONFIG_COMMON_CLKDEV=y

5
arch/arm/mach-mmp/mmp2.c
View File

@ -15,6 +15,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/hardware/cache-tauros2.h>
#include <mach/addr-map.h> #include <mach/addr-map.h>
#include <mach/regs-apbc.h> #include <mach/regs-apbc.h>
#include <mach/regs-apmu.h> #include <mach/regs-apmu.h>
@ -99,6 +101,9 @@ static struct clk_lookup mmp2_clkregs[] = {
static int __init mmp2_init(void) static int __init mmp2_init(void)
{ {
if (cpu_is_mmp2()) { if (cpu_is_mmp2()) {
#ifdef CONFIG_CACHE_TAUROS2
tauros2_init();
#endif
mfp_init_base(MFPR_VIRT_BASE); mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(mmp2_addr_map); mfp_init_addr(mmp2_addr_map);
clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs)); clkdev_add_table(ARRAY_AND_SIZE(mmp2_clkregs));

2
arch/arm/mm/Kconfig
View File

@ -769,7 +769,7 @@ config CACHE_L2X0
config CACHE_TAUROS2 config CACHE_TAUROS2
bool "Enable the Tauros2 L2 cache controller" bool "Enable the Tauros2 L2 cache controller"
depends on ARCH_DOVE depends on (ARCH_DOVE || ARCH_MMP)
default y default y
select OUTER_CACHE select OUTER_CACHE
help help