Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221067
b: refs/heads/master
c: 1d826d1
h: refs/heads/master
i:
  221065: 458a2ad
  221063: eb9d1a2
v: v3
  • Loading branch information
Jaecheol Lee authored and Kukjin Kim committed Oct 20, 2010
1 parent 97feb2b commit 794bfca
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a5555822ea83d583b46437cff6829eec0166475
refs/heads/master: 1d826d14cc2783d0c09750c2e1eeb2bdd358769b
10 changes: 10 additions & 0 deletions trunk/arch/arm/mach-s5pv210/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
.pfn = __phys_to_pfn(S5PV210_PA_SROMC),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S5P_VA_DMC0,
.pfn = __phys_to_pfn(S5PV210_PA_DMC0),
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (unsigned long)S5P_VA_DMC1,
.pfn = __phys_to_pfn(S5PV210_PA_DMC1),
.length = SZ_4K,
.type = MT_DEVICE,
}
};

Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/arm/mach-s5pv210/include/mach/map.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@

#define S5PV210_PA_ADC (0xE1700000)

#define S5PV210_PA_DMC0 (0xF0000000)
#define S5PV210_PA_DMC1 (0xF1400000)

/* compatibiltiy defines. */
#define S3C_PA_UART S5PV210_PA_UART
#define S3C_PA_HSMMC0 S5PV210_PA_HSMMC(0)
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/arm/plat-s5p/include/plat/map-s5p.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#define S5P_VA_SYSTIMER S3C_ADDR(0x01200000)
#define S5P_VA_SROMC S3C_ADDR(0x01100000)
#define S5P_VA_SYSRAM S3C_ADDR(0x01180000)
#define S5P_VA_DMC0 S3C_ADDR(0x00A00000)
#define S5P_VA_DMC1 S3C_ADDR(0x00A80000)

#define S5P_VA_COMBINER_BASE S3C_ADDR(0x00600000)
#define S5P_VA_COMBINER(x) (S5P_VA_COMBINER_BASE + ((x) >> 2) * 0x10)
Expand Down

0 comments on commit 794bfca

Please sign in to comment.