diff options
| author | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
| commit | 22cf644e03419b4c3d002109b021c7482306f0bf (patch) | |
| tree | db426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-omap2/io.c | |
| parent | Linux 3.9-rc6 (diff) | |
| parent | ARM: exynos: restore mach/regs-clock.h for exynos5 (diff) | |
| download | kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip | |
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 5c445ca1e271..e210fa830f8d 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -277,6 +277,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 @@ -329,6 +337,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 /* |