diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-12-11 19:24:38 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-10 12:26:52 -0400 |
commit | 5b3d515fcfe93d012107b9bd4895e2d913cbe8c3 (patch) | |
tree | 22405effe96391578059312debeb829099679685 /arch | |
parent | 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f (diff) |
[ARM] S3C64XX: Add modem registers and a virtual map
Add the modem registers and a virtual mapping for the
modem block. This is is required as there are registers
that control the LCD block that need to be saved over
suspend as well as interrupt controls.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 3 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/cpu.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/include/plat/regs-modem.h | 31 |
3 files changed, 39 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index cff27d813fc6..baf1c0f1ea5a 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
@@ -52,6 +52,9 @@ | |||
52 | #define S3C64XX_PA_VIC0 (0x71200000) | 52 | #define S3C64XX_PA_VIC0 (0x71200000) |
53 | #define S3C64XX_PA_VIC1 (0x71300000) | 53 | #define S3C64XX_PA_VIC1 (0x71300000) |
54 | 54 | ||
55 | #define S3C64XX_PA_MODEM (0x74108000) | ||
56 | #define S3C64XX_VA_MODEM S3C_ADDR(0x00600000) | ||
57 | |||
55 | /* place VICs close together */ | 58 | /* place VICs close together */ |
56 | #define S3C_VA_VIC0 (S3C_VA_IRQ + 0x00) | 59 | #define S3C_VA_VIC0 (S3C_VA_IRQ + 0x00) |
57 | #define S3C_VA_VIC1 (S3C_VA_IRQ + 0x10000) | 60 | #define S3C_VA_VIC1 (S3C_VA_IRQ + 0x10000) |
diff --git a/arch/arm/plat-s3c64xx/cpu.c b/arch/arm/plat-s3c64xx/cpu.c index fbde183a4560..91f49a3a665d 100644 --- a/arch/arm/plat-s3c64xx/cpu.c +++ b/arch/arm/plat-s3c64xx/cpu.c | |||
@@ -96,6 +96,11 @@ static struct map_desc s3c_iodesc[] __initdata = { | |||
96 | .pfn = __phys_to_pfn(S3C64XX_PA_GPIO), | 96 | .pfn = __phys_to_pfn(S3C64XX_PA_GPIO), |
97 | .length = SZ_4K, | 97 | .length = SZ_4K, |
98 | .type = MT_DEVICE, | 98 | .type = MT_DEVICE, |
99 | }, { | ||
100 | .virtual = (unsigned long)S3C64XX_VA_MODEM, | ||
101 | .pfn = __phys_to_pfn(S3C64XX_PA_MODEM), | ||
102 | .length = SZ_4K, | ||
103 | .type = MT_DEVICE, | ||
99 | }, | 104 | }, |
100 | }; | 105 | }; |
101 | 106 | ||
diff --git a/arch/arm/plat-s3c64xx/include/plat/regs-modem.h b/arch/arm/plat-s3c64xx/include/plat/regs-modem.h new file mode 100644 index 000000000000..49f7759dedfa --- /dev/null +++ b/arch/arm/plat-s3c64xx/include/plat/regs-modem.h | |||
@@ -0,0 +1,31 @@ | |||
1 | /* arch/arm/plat-s3c64xx/include/plat/regs-modem.h | ||
2 | * | ||
3 | * Copyright 2008 Openmoko, Inc. | ||
4 | * Copyright 2008 Simtec Electronics | ||
5 | * http://armlinux.simtec.co.uk/ | ||
6 | * Ben Dooks <ben@simtec.co.uk> | ||
7 | * | ||
8 | * S3C64XX - modem block registers | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __PLAT_S3C64XX_REGS_MODEM_H | ||
16 | #define __PLAT_S3C64XX_REGS_MODEM_H __FILE__ | ||
17 | |||
18 | #define S3C64XX_MODEMREG(x) (S3C64XX_VA_MODEM + (x)) | ||
19 | |||
20 | #define S3C64XX_MODEM_INT2AP S3C64XX_MODEMREG(0x0) | ||
21 | #define S3C64XX_MODEM_INT2MODEM S3C64XX_MODEMREG(0x4) | ||
22 | #define S3C64XX_MODEM_MIFCON S3C64XX_MODEMREG(0x8) | ||
23 | #define S3C64XX_MODEM_MIFPCON S3C64XX_MODEMREG(0xC) | ||
24 | #define S3C64XX_MODEM_INTCLR S3C64XX_MODEMREG(0x10) | ||
25 | #define S3C64XX_MODEM_DMA_TXADDR S3C64XX_MODEMREG(0x14) | ||
26 | #define S3C64XX_MODEM_DMA_RXADDR S3C64XX_MODEMREG(0x18) | ||
27 | |||
28 | #define MIFPCON_INT2M_LEVEL (1 << 4) | ||
29 | #define MIFPCON_LCD_BYPASS (1 << 3) | ||
30 | |||
31 | #endif /* __PLAT_S3C64XX_REGS_MODEM_H */ | ||