Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-11-13 15:02:41 +00:00 committed by Russell King
parent d9a682a592
commit 8959dabdf2
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/mach-clps711x/include/mach/hardware.h
View file

@ -94,16 +94,6 @@
#include <asm/hardware/ep7212.h> #include <asm/hardware/ep7212.h>
#include <asm/hardware/cs89712.h> #include <asm/hardware/cs89712.h>
/* dynamic ioremap() areas */
#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 cdb89712_map_io() areas */ /* static cdb89712_map_io() areas */
#define REGISTER_START 0x80000000 #define REGISTER_START 0x80000000
#define REGISTER_SIZE 0x4000 #define REGISTER_SIZE 0x4000
@ -194,14 +184,6 @@
#define CEIVA_FLASH_SIZE 0x100000 #define CEIVA_FLASH_SIZE 0x100000
#define CEIVA_FLASH_WIDTH 2 #define CEIVA_FLASH_WIDTH 2
#define SRAM_START 0x60000000
#define SRAM_SIZE 0xc000
#define SRAM_WIDTH 4
#define BOOTROM_START 0x70000000
#define BOOTROM_SIZE 0x80
#define BOOTROM_WIDTH 4
/* /*
* SED1355 LCD controller * SED1355 LCD controller
*/ */

11
drivers/mtd/maps/cdb89712.c
View file

@ -14,11 +14,20 @@
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
/* dynamic ioremap() areas */
#define FLASH_START 0x00000000 #define FLASH_START 0x00000000
#define FLASH_SIZE 0x800000 #define FLASH_SIZE 0x800000
#define FLASH_WIDTH 4 #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; static struct mtd_info *flash_mtd;
struct map_info cdb89712_flash_map = { struct map_info cdb89712_flash_map = {