diff options
author | Sunyoung Kang <sy0816.kang@samsung.com> | 2010-12-21 17:21:17 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-23 00:53:39 -0500 |
commit | dd0b7e20da906b40d55f24bb2dc21abd58ed3f55 (patch) | |
tree | f4b66c9b95a8883c6633b0a9edb8ff15292baa77 /arch/arm | |
parent | 09dc781e94b881d23e3c5da8c72d6832ae542938 (diff) |
ARM: S5PV310: Add DMC registers and map_desc
This patch adds DMC io mapping for access it and adds registers.
This is used in checking DRAM memory type.
Signed-off-by: Sunyoung Kang <sy0816.kang@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s5pv310/cpu.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/include/mach/map.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv310/include/mach/regs-mem.h | 23 |
3 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/cpu.c b/arch/arm/mach-s5pv310/cpu.c index 82ce4aa6d61a..283dd75effe7 100644 --- a/arch/arm/mach-s5pv310/cpu.c +++ b/arch/arm/mach-s5pv310/cpu.c | |||
@@ -73,6 +73,11 @@ static struct map_desc s5pv310_iodesc[] __initdata = { | |||
73 | .length = SZ_256, | 73 | .length = SZ_256, |
74 | .type = MT_DEVICE, | 74 | .type = MT_DEVICE, |
75 | }, { | 75 | }, { |
76 | .virtual = (unsigned long)S5P_VA_DMC0, | ||
77 | .pfn = __phys_to_pfn(S5PV310_PA_DMC0), | ||
78 | .length = SZ_4K, | ||
79 | .type = MT_DEVICE, | ||
80 | }, { | ||
76 | .virtual = (unsigned long)S3C_VA_UART, | 81 | .virtual = (unsigned long)S3C_VA_UART, |
77 | .pfn = __phys_to_pfn(S3C_PA_UART), | 82 | .pfn = __phys_to_pfn(S3C_PA_UART), |
78 | .length = SZ_512K, | 83 | .length = SZ_512K, |
diff --git a/arch/arm/mach-s5pv310/include/mach/map.h b/arch/arm/mach-s5pv310/include/mach/map.h index 7acf4e77e92e..37294f13ca0c 100644 --- a/arch/arm/mach-s5pv310/include/mach/map.h +++ b/arch/arm/mach-s5pv310/include/mach/map.h | |||
@@ -44,6 +44,8 @@ | |||
44 | #define S5PV310_PA_WATCHDOG (0x10060000) | 44 | #define S5PV310_PA_WATCHDOG (0x10060000) |
45 | #define S5PV310_PA_RTC (0x10070000) | 45 | #define S5PV310_PA_RTC (0x10070000) |
46 | 46 | ||
47 | #define S5PV310_PA_DMC0 (0x10400000) | ||
48 | |||
47 | #define S5PV310_PA_COMBINER (0x10448000) | 49 | #define S5PV310_PA_COMBINER (0x10448000) |
48 | 50 | ||
49 | #define S5PV310_PA_COREPERI (0x10500000) | 51 | #define S5PV310_PA_COREPERI (0x10500000) |
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 @@ | |||
1 | /* linux/arch/arm/mach-s5pv310/include/mach/regs-mem.h | ||
2 | * | ||
3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
4 | * http://www.samsung.com | ||
5 | * | ||
6 | * S5PV310 - SROMC and DMC register definitions | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_REGS_MEM_H | ||
14 | #define __ASM_ARCH_REGS_MEM_H __FILE__ | ||
15 | |||
16 | #include <mach/map.h> | ||
17 | |||
18 | #define S5P_DMC0_MEMCON_OFFSET 0x04 | ||
19 | |||
20 | #define S5P_DMC0_MEMTYPE_SHIFT 8 | ||
21 | #define S5P_DMC0_MEMTYPE_MASK 0xF | ||
22 | |||
23 | #endif /* __ASM_ARCH_REGS_MEM_H */ | ||