diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 11:30:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-13 11:30:25 -0800 |
commit | 90aaa53c5a5af33a061313681d8f3234712b866b (patch) | |
tree | f7d841e7e1aecfb639fedb1bfefeb5f6ba7fa22d /drivers/mtd/maps/cdb89712.c | |
parent | 906bf113beb07a76b665c3863aa864acdc8f9950 (diff) | |
parent | 8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
[ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
[ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
[ARM] dma-mapping: fix compiler warning
[ARM] iop: iop3xx needs registers mapped uncached+unbuffered
[ARM] versatile: correct MMC clock rate
[ARM] realview: correct MMC clock rate
[ARM] 5329/1: Feroceon: fix feroceon_l2_inv_range
Diffstat (limited to 'drivers/mtd/maps/cdb89712.c')
-rw-r--r-- | drivers/mtd/maps/cdb89712.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c index e5059aa3c72..8d92d8db9a9 100644 --- a/drivers/mtd/maps/cdb89712.c +++ b/drivers/mtd/maps/cdb89712.c @@ -14,7 +14,18 @@ #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> - +/* dynamic ioremap() areas */ +#define FLASH_START 0x00000000 +#define FLASH_SIZE 0x800000 +#define FLASH_WIDTH 4 + +#define SRAM_START 0x60000000 +#define SRAM_SIZE 0xc000 +#define SRAM_WIDTH 4 + +#define BOOTROM_START 0x70000000 +#define BOOTROM_SIZE 0x80 +#define BOOTROM_WIDTH 4 static struct mtd_info *flash_mtd; |