aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-13 10:02:41 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-13 10:05:03 -0500
commit8959dabdf2f8f9ce982a2c4cfe6d1652a2fb6320 (patch)
tree24b4085ac1fca3fce15880b9d936dc2f17718654
parentd9a682a592ff5905d328c648fd30ee7fa12ce8ab (diff)
[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-clps711x/include/mach/hardware.h18
-rw-r--r--drivers/mtd/maps/cdb89712.c11
2 files changed, 10 insertions, 19 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 7cc675c93e20..b3ebe9e4871f 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -94,16 +94,6 @@
94#include <asm/hardware/ep7212.h> 94#include <asm/hardware/ep7212.h>
95#include <asm/hardware/cs89712.h> 95#include <asm/hardware/cs89712.h>
96 96
97/* dynamic ioremap() areas */
98#define SRAM_START 0x60000000
99#define SRAM_SIZE 0xc000
100#define SRAM_WIDTH 4
101
102#define BOOTROM_START 0x70000000
103#define BOOTROM_SIZE 0x80
104#define BOOTROM_WIDTH 4
105
106
107/* static cdb89712_map_io() areas */ 97/* static cdb89712_map_io() areas */
108#define REGISTER_START 0x80000000 98#define REGISTER_START 0x80000000
109#define REGISTER_SIZE 0x4000 99#define REGISTER_SIZE 0x4000
@@ -194,14 +184,6 @@
194#define CEIVA_FLASH_SIZE 0x100000 184#define CEIVA_FLASH_SIZE 0x100000
195#define CEIVA_FLASH_WIDTH 2 185#define CEIVA_FLASH_WIDTH 2
196 186
197#define SRAM_START 0x60000000
198#define SRAM_SIZE 0xc000
199#define SRAM_WIDTH 4
200
201#define BOOTROM_START 0x70000000
202#define BOOTROM_SIZE 0x80
203#define BOOTROM_WIDTH 4
204
205/* 187/*
206 * SED1355 LCD controller 188 * SED1355 LCD controller
207 */ 189 */
diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c
index d7bc4299b19c..8d92d8db9a98 100644
--- a/drivers/mtd/maps/cdb89712.c
+++ b/drivers/mtd/maps/cdb89712.c
@@ -14,11 +14,20 @@
14#include <linux/mtd/map.h> 14#include <linux/mtd/map.h>
15#include <linux/mtd/partitions.h> 15#include <linux/mtd/partitions.h>
16 16
17 17/* dynamic ioremap() areas */
18#define FLASH_START 0x00000000 18#define FLASH_START 0x00000000
19#define FLASH_SIZE 0x800000 19#define FLASH_SIZE 0x800000
20#define FLASH_WIDTH 4 20#define FLASH_WIDTH 4
21 21
22#define SRAM_START 0x60000000
23#define SRAM_SIZE 0xc000
24#define SRAM_WIDTH 4
25
26#define BOOTROM_START 0x70000000
27#define BOOTROM_SIZE 0x80
28#define BOOTROM_WIDTH 4
29
30
22static struct mtd_info *flash_mtd; 31static struct mtd_info *flash_mtd;
23 32
24struct map_info cdb89712_flash_map = { 33struct map_info cdb89712_flash_map = {