diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-01 09:30:47 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-01 09:30:47 -0700 |
| commit | 105612489bf59386b46b3f9f034e03f70e57aee6 (patch) | |
| tree | d6a5d2ba3702a69649ea59c6cb31caadb9941459 /arch/arm/mach-omap2/io.c | |
| parent | d29778a01d5fc4b69ca1e7bc21121536e5c1c31d (diff) | |
| parent | ecf51648c192377ea2830101b12fc3017bfd2b0c (diff) | |
Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 2c3fdd65387..2bef5a7e6af 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -271,6 +271,14 @@ static struct map_desc omap54xx_io_desc[] __initdata = { .length = L4_PER_54XX_SIZE, .type = MT_DEVICE, }, +#ifdef CONFIG_OMAP4_ERRATA_I688 + { + .virtual = OMAP4_SRAM_VA, + .pfn = __phys_to_pfn(OMAP4_SRAM_PA), + .length = PAGE_SIZE, + .type = MT_MEMORY_SO, + }, +#endif }; #endif @@ -323,6 +331,7 @@ void __init omap4_map_io(void) void __init omap5_map_io(void) { iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc)); + omap_barriers_init(); } #endif /* |