diff options
author | Tony Lindgren <tony@atomide.com> | 2006-04-02 12:46:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 12:46:27 -0400 |
commit | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (patch) | |
tree | f08247e64219571b634faf5a809e8505fb0292f2 /arch/arm/mach-omap2/io.c | |
parent | 0dc5e77c46c6b02e8286f17544d93d614c0cb892 (diff) |
[ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
Patch from Tony Lindgren
Update misc OMAP core code from linux-omap tree:
- McBSP updates by Samuel Ortiz, Andrzej Zaborowski
- Whitespace cleanups by Ladislav Michl
- Other fixes by various linux-omap developers
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 8ea67bf196a5..7d5711611f2f 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -16,9 +16,13 @@ | |||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | 18 | ||
19 | #include <asm/mach/map.h> | 19 | #include <asm/tlb.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | |||
22 | #include <asm/mach/map.h> | ||
23 | |||
21 | #include <asm/arch/mux.h> | 24 | #include <asm/arch/mux.h> |
25 | #include <asm/arch/omapfb.h> | ||
22 | 26 | ||
23 | extern void omap_sram_init(void); | 27 | extern void omap_sram_init(void); |
24 | extern int omap2_clk_init(void); | 28 | extern int omap2_clk_init(void); |
@@ -43,11 +47,24 @@ static struct map_desc omap2_io_desc[] __initdata = { | |||
43 | } | 47 | } |
44 | }; | 48 | }; |
45 | 49 | ||
46 | void __init omap_map_common_io(void) | 50 | void __init omap2_map_common_io(void) |
47 | { | 51 | { |
48 | iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc)); | 52 | iotable_init(omap2_io_desc, ARRAY_SIZE(omap2_io_desc)); |
53 | |||
54 | /* Normally devicemaps_init() would flush caches and tlb after | ||
55 | * mdesc->map_io(), but we must also do it here because of the CPU | ||
56 | * revision check below. | ||
57 | */ | ||
58 | local_flush_tlb_all(); | ||
59 | flush_cache_all(); | ||
60 | |||
49 | omap2_check_revision(); | 61 | omap2_check_revision(); |
50 | omap_sram_init(); | 62 | omap_sram_init(); |
63 | omapfb_reserve_mem(); | ||
64 | } | ||
65 | |||
66 | void __init omap2_init_common_hw(void) | ||
67 | { | ||
51 | omap2_mux_init(); | 68 | omap2_mux_init(); |
52 | omap2_clk_init(); | 69 | omap2_clk_init(); |
53 | } | 70 | } |