diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-davinci/include/mach/ddr2.h | |
parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/ddr2.h')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/ddr2.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/ddr2.h b/arch/arm/mach-davinci/include/mach/ddr2.h new file mode 100644 index 000000000000..c19e047d0e6a --- /dev/null +++ b/arch/arm/mach-davinci/include/mach/ddr2.h | |||
@@ -0,0 +1,4 @@ | |||
1 | #define DDR2_SDRCR_OFFSET 0xc | ||
2 | #define DDR2_SRPD_BIT (1 << 23) | ||
3 | #define DDR2_MCLKSTOPEN_BIT (1 << 30) | ||
4 | #define DDR2_LPMODEN_BIT (1 << 31) | ||