xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next

Browse Source
This commit is contained in:
Russell King
2014-01-21 21:26:33 +00:00
parent d6e0a2dd12 5303c0f46c b25f3e1c35 71b55663c5 668bc38669 162e68c08c
commit 6f14d778c1
64 changed files with 1155 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/omap4-common.c
View File

@@ -87,7 +87,7 @@ void __init omap_barriers_init(void)
dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
dram_io_desc[0].pfn = __phys_to_pfn(paddr);
dram_io_desc[0].length = size;
dram_io_desc[0].type = MT_MEMORY_SO;
dram_io_desc[0].type = MT_MEMORY_RW_SO;
iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));
dram_sync = (void __iomem *) dram_io_desc[0].virtual;
sram_sync = (void __iomem *) OMAP4_SRAM_VA;
@@ -162,6 +162,7 @@ void __iomem *omap4_get_l2cache_base(void)
static void omap4_l2x0_disable(void)
{
outer_flush_all();
/* Disable PL310 L2 Cache controller */
omap_smc1(0x102, 0x0);
}