Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[karo-tx-linux.git] / arch / arm / mach-shmobile / setup-r8a7779.c

diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 8e860b36997a670b4e0ad5a4af1368f5b5da510e..a6630fccfc45779a016db30fc474a9dfa629cc5b 100644 (file)
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -700,8 +700,8 @@ static struct platform_device *r8a7779_standard_devices[] __initdata = {
 void __init r8a7779_add_standard_devices(void)
 {
 #ifdef CONFIG_CACHE_L2X0
-       /* Early BRESP enable, Shared attribute override enable, 64K*16way */
-       l2x0_init(IOMEM(0xf0100000), 0x40470000, 0x82000fff);
+       /* Shared attribute override enable, 64K*16way */
+       l2x0_init(IOMEM(0xf0100000), 0x00400000, 0xc20f0fff);
 #endif
        r8a7779_pm_init();