diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-01-03 18:59:54 +0900 |
commit | c6906c3e29a4a28660f70421935c91cf6b8ab1e1 (patch) | |
tree | 40d97bdc21b95788ab24a4824c769b9dbe9b602b /arch/arm/mach-s5pv310/include/mach/regs-mem.h | |
parent | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (diff) | |
parent | 8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 (diff) | |
download | blackbird-op-linux-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.tar.gz blackbird-op-linux-c6906c3e29a4a28660f70421935c91cf6b8ab1e1.zip |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv310/include/mach/regs-mem.h')
-rw-r--r-- | arch/arm/mach-s5pv310/include/mach/regs-mem.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/regs-mem.h b/arch/arm/mach-s5pv310/include/mach/regs-mem.h new file mode 100644 index 000000000000..834227140eaa --- /dev/null +++ b/arch/arm/mach-s5pv310/include/mach/regs-mem.h @@ -0,0 +1,23 @@ +/* linux/arch/arm/mach-s5pv310/include/mach/regs-mem.h + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * S5PV310 - SROMC and DMC register definitions + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef __ASM_ARCH_REGS_MEM_H +#define __ASM_ARCH_REGS_MEM_H __FILE__ + +#include <mach/map.h> + +#define S5P_DMC0_MEMCON_OFFSET 0x04 + +#define S5P_DMC0_MEMTYPE_SHIFT 8 +#define S5P_DMC0_MEMTYPE_MASK 0xF + +#endif /* __ASM_ARCH_REGS_MEM_H */ |