Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8959dabd authored by Russell King's avatar Russell King Committed by Russell King
Browse files

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



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d9a682a5

arch/arm/mach-clps711x/include/mach/hardware.h

+0 −18
Original line number Diff line number Diff line
@@ -94,16 +94,6 @@ 
#include <asm/hardware/ep7212.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 */

#define REGISTER_START   0x80000000

#define REGISTER_SIZE    0x4000
@@ -194,14 +184,6 @@ 
#define CEIVA_FLASH_SIZE        0x100000

#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

 */

drivers/mtd/maps/cdb89712.c

+10 −1
Original line number Diff line number Diff line
@@ -14,11 +14,20 @@ 
#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;



struct map_info cdb89712_flash_map = {