diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-10-06 12:49:36 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-10-06 12:49:36 (GMT) |
| commit | 646e3ed1a349fbccce651fed2d3987f0e7b0f0f4 (patch) | |
| tree | b9c4d52027da1468e52294f3f8db3afb0720c86d /arch/arm/mach-omap2/memory.h | |
| parent | fd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd (diff) | |
| download | linux-fsl-qoriq-646e3ed1a349fbccce651fed2d3987f0e7b0f0f4.tar.xz | |
ARM: OMAP2: Misc updates from linux-omap tree
Misc updates from linux-omap tree, mostly to update common
device initialization and add missing defines from linux-omap
tree. Also some changes to make room for adding 34xx in
following patches.
Note that the I2C resources are now set up in
arch/arm/plat-omap/i2c.c helper, and can be removed
from devices.c.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/memory.h')
| -rw-r--r-- | arch/arm/mach-omap2/memory.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/memory.h b/arch/arm/mach-omap2/memory.h index 9a280b5..bb3db80 100644 --- a/arch/arm/mach-omap2/memory.h +++ b/arch/arm/mach-omap2/memory.h @@ -14,6 +14,9 @@ * published by the Free Software Foundation. */ +#ifndef ARCH_ARM_MACH_OMAP2_MEMORY_H +#define ARCH_ARM_MACH_OMAP2_MEMORY_H + /* Memory timings */ #define M_DDR 1 #define M_LOCK_CTRL (1 << 2) @@ -34,3 +37,7 @@ extern u32 omap2_memory_get_fast_dll_ctrl(void); extern u32 omap2_memory_get_type(void); u32 omap2_dll_force_needed(void); u32 omap2_reprogram_sdrc(u32 level, u32 force); +void __init omap2_init_memory(void); +void __init gpmc_init(void); + +#endif |