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,clps7500,h720x: avoid namespace clash for FLASH_* constants

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

authored by

Russell King and committed by
Russell King d9a682a5 1e8b0416

+15 -17
-4
arch/arm/mach-clps711x/include/mach/hardware.h
··· 95 95 #include <asm/hardware/cs89712.h> 96 96 97 97 /* dynamic ioremap() areas */ 98 - #define FLASH_START 0x00000000 99 - #define FLASH_SIZE 0x800000 100 - #define FLASH_WIDTH 4 101 - 102 98 #define SRAM_START 0x60000000 103 99 #define SRAM_SIZE 0xc000 104 100 #define SRAM_WIDTH 4
+3 -3
arch/arm/mach-clps7500/core.c
··· 275 275 .length = ISA_SIZE, 276 276 .type = MT_DEVICE 277 277 }, { /* Flash */ 278 - .virtual = FLASH_BASE, 279 - .pfn = __phys_to_pfn(FLASH_START), 280 - .length = FLASH_SIZE, 278 + .virtual = CLPS7500_FLASH_BASE, 279 + .pfn = __phys_to_pfn(CLPS7500_FLASH_START), 280 + .length = CLPS7500_FLASH_SIZE, 281 281 .type = MT_DEVICE 282 282 }, { /* LED */ 283 283 .virtual = LED_BASE,
+3 -3
arch/arm/mach-clps7500/include/mach/hardware.h
··· 39 39 #define ISA_SIZE 0x00010000 40 40 #define ISA_BASE 0xe1000000 41 41 42 - #define FLASH_START 0x01000000 /* XXX */ 43 - #define FLASH_SIZE 0x01000000 44 - #define FLASH_BASE 0xe2000000 42 + #define CLPS7500_FLASH_START 0x01000000 /* XXX */ 43 + #define CLPS7500_FLASH_SIZE 0x01000000 44 + #define CLPS7500_FLASH_BASE 0xe2000000 45 45 46 46 #define LED_START 0x0302B000 47 47 #define LED_SIZE 0x00001000
+3 -3
arch/arm/mach-h720x/include/mach/boards.h
··· 19 19 #ifdef CONFIG_ARCH_H7202 20 20 21 21 /* FLASH */ 22 - #define FLASH_VIRT 0xd0000000 23 - #define FLASH_PHYS 0x00000000 24 - #define FLASH_SIZE 0x02000000 22 + #define H720X_FLASH_VIRT 0xd0000000 23 + #define H720X_FLASH_PHYS 0x00000000 24 + #define H720X_FLASH_SIZE 0x02000000 25 25 26 26 /* onboard LAN controller */ 27 27 # define ETH0_PHYS 0x08000000
+3 -1
drivers/mtd/maps/cdb89712.c
··· 15 15 #include <linux/mtd/partitions.h> 16 16 17 17 18 - 18 + #define FLASH_START 0x00000000 19 + #define FLASH_SIZE 0x800000 20 + #define FLASH_WIDTH 4 19 21 20 22 static struct mtd_info *flash_mtd; 21 23
+3 -3
drivers/mtd/maps/h720x-flash.c
··· 24 24 static struct map_info h720x_map = { 25 25 .name = "H720X", 26 26 .bankwidth = 4, 27 - .size = FLASH_SIZE, 28 - .phys = FLASH_PHYS, 27 + .size = H720X_FLASH_SIZE, 28 + .phys = H720X_FLASH_PHYS, 29 29 }; 30 30 31 31 static struct mtd_partition h720x_partitions[] = { ··· 70 70 71 71 char *part_type = NULL; 72 72 73 - h720x_map.virt = ioremap(FLASH_PHYS, FLASH_SIZE); 73 + h720x_map.virt = ioremap(h720x_map.phys, h720x_map.size); 74 74 75 75 if (!h720x_map.virt) { 76 76 printk(KERN_ERR "H720x-MTD: ioremap failed\n");