From b046e5cfc27542521eb1b93a13aa620b18c94600 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Thu, 1 Mar 2012 12:48:03 +0900
Subject: [PATCH] --- yaml --- r: 295789 b: refs/heads/master c:
 8bac13f591652d0c561f5788eaf0862f788a668f h: refs/heads/master i:   295787:
 c634c96d2dfe1b4a0bc749384042739b23d1282b v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-shmobile/setup-r8a7779.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5e85ab5b02ed..c545c6d25fb9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e353b875b2480e98acb9ed96a377025d0ed7b82
+refs/heads/master: 8bac13f591652d0c561f5788eaf0862f788a668f
diff --git a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
index 4378b4dea1dc..9bb133c2a932 100644
--- a/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/trunk/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -34,6 +34,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/hardware/cache-l2x0.h>
 
 static struct map_desc r8a7779_io_desc[] __initdata = {
 	/* 2M entity map for 0xf0000000 (MPCORE) */
@@ -242,6 +243,10 @@ static struct platform_device *r8a7779_late_devices[] __initdata = {
 
 void __init r8a7779_add_standard_devices(void)
 {
+#ifdef CONFIG_CACHE_L2X0
+	/* Early BRESP enable, Shared attribute override enable, 64K*16way */
+	l2x0_init(__io(0xf0100000), 0x40470000, 0x82000fff);
+#endif
 	r8a7779_pm_init();
 
 	r8a7779_init_pm_domain(&r8a7779_sh4a);