diff options
| author | Paul Walmsley | 2009-01-28 20:27:31 +0100 |
|---|---|---|
| committer | Russell King | 2009-02-08 18:50:38 +0100 |
| commit | f8de9b2c45c4506702da4bd3a5bc7630754077f9 (patch) | |
| tree | f375f808bfdc0ef8c83671aca66f3150b08e44e5 /arch/arm/mach-omap2/memory.c | |
| parent | [ARM] omap: Fix omap1 clock issues (diff) | |
| download | kernel-qcow2-linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.tar.gz kernel-qcow2-linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.tar.xz kernel-qcow2-linux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.zip | |
[ARM] OMAP2 SDRC: move mach-omap2/memory.h into mach/sdrc.h
Move the contents of the arch/arm/mach-omap2/memory.h file to the
existing mach/sdrc.h file, and remove memory.h. Modify files which
include memory.h to include asm/arch/sdrc.h instead.
linux-omap source commit is e7ae2d89921372fc4b9712a32cc401d645597807.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
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/memory.c')
| -rw-r--r-- | arch/arm/mach-omap2/memory.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 882c70224292..93cb25715bac 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c @@ -29,9 +29,16 @@ #include "prm.h" -#include "memory.h" +#include <mach/sdrc.h> #include "sdrc.h" +/* Memory timing, DLL mode flags */ +#define M_DDR 1 +#define M_LOCK_CTRL (1 << 2) +#define M_UNLOCK 0 +#define M_LOCK 1 + + void __iomem *omap2_sdrc_base; void __iomem *omap2_sms_base; |