diff options
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index febffde2ff1..8d130931115 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -132,6 +132,7 @@ void omap3_map_io(void); void am33xx_map_io(void); void omap4_map_io(void); void ti81xx_map_io(void); +int omap_barriers_init(void); /** * omap_test_timeout - busy-loop, testing a condition diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index eb50c29fb64..da8b65d7143 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -306,7 +306,12 @@ void __init omapam33xx_map_common_io(void) #ifdef CONFIG_ARCH_OMAP4 void __init omap44xx_map_common_io(void) { + int res; + iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc)); + res = omap_barriers_init(); + if (res) + pr_err("Barriers broken\n"); } #endif diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 40a8fbc07e4..55418ac90ee 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c @@ -52,7 +52,7 @@ void omap_bus_sync(void) } } -static int __init omap_barriers_init(void) +int __init omap_barriers_init(void) { struct map_desc dram_io_desc[1]; phys_addr_t paddr; @@ -77,7 +77,11 @@ static int __init omap_barriers_init(void) return 0; } -core_initcall(omap_barriers_init); +#else +int __init omap_barriers_init(void) +{ + return 0; +} #endif void __init gic_init_irq(void) |