tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King 8959dabd d9a682a5

+10 -19
-18
arch/arm/mach-clps711x/include/mach/hardware.h
··· 94 94 #include <asm/hardware/ep7212.h> 95 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 97 /* static cdb89712_map_io() areas */ 108 98 #define REGISTER_START 0x80000000 109 99 #define REGISTER_SIZE 0x4000 ··· 183 193 184 194 #define CEIVA_FLASH_SIZE 0x100000 185 195 #define CEIVA_FLASH_WIDTH 2 186 - 187 - #define SRAM_START 0x60000000 188 - #define SRAM_SIZE 0xc000 189 - #define SRAM_WIDTH 4 190 - 191 - #define BOOTROM_START 0x70000000 192 - #define BOOTROM_SIZE 0x80 193 - #define BOOTROM_WIDTH 4 194 196 195 197 /* 196 198 * SED1355 LCD controller
+10 -1
drivers/mtd/maps/cdb89712.c
··· 14 14 #include <linux/mtd/map.h> 15 15 #include <linux/mtd/partitions.h> 16 16 17 - 17 + /* dynamic ioremap() areas */ 18 18 #define FLASH_START 0x00000000 19 19 #define FLASH_SIZE 0x800000 20 20 #define FLASH_WIDTH 4 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 + 21 30 22 31 static struct mtd_info *flash_mtd; 23 32