diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-03-13 11:37:08 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-22 21:57:54 -0400 |
commit | 5c0dbb8fc2b36619684cbb7486491ecac950a595 (patch) | |
tree | 96c3ac88b7772c0640cbcf9307411b4d29ab5c55 /arch/arm/mach-pxa/include/mach/colibri.h | |
parent | fa12868e59f5f49bc42b8befd94c531bb07ec120 (diff) |
[ARM] pxa: rename colibri.c to colibri-pxa270.c
Namespace cleanup: rename colibri.c to colibri-pxa270.c and change
some names in colibri.h.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/colibri.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 2ae373fb5675..c7c99d078817 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h | |||
@@ -2,18 +2,13 @@ | |||
2 | #define _COLIBRI_H_ | 2 | #define _COLIBRI_H_ |
3 | 3 | ||
4 | /* physical memory regions */ | 4 | /* physical memory regions */ |
5 | #define COLIBRI_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */ | ||
6 | #define COLIBRI_ETH_PHYS (PXA_CS2_PHYS) /* Ethernet DM9000 region */ | ||
7 | #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */ | 5 | #define COLIBRI_SDRAM_BASE 0xa0000000 /* SDRAM region */ |
8 | 6 | ||
9 | /* virtual memory regions */ | 7 | #define COLIBRI_PXA270_FLASH_PHYS (PXA_CS0_PHYS) /* Flash region */ |
10 | #define COLIBRI_DISK_VIRT 0xF0000000 /* Disk On Chip region */ | 8 | #define COLIBRI_PXA270_ETH_PHYS (PXA_CS2_PHYS) /* Ethernet */ |
11 | 9 | #define COLIBRI_PXA270_ETH_IRQ_GPIO 114 | |
12 | /* size of flash */ | 10 | #define COLIBRI_PXA270_ETH_IRQ \ |
13 | #define COLIBRI_FLASH_SIZE 0x02000000 /* Flash size 32 MB */ | 11 | gpio_to_irq(mfp_to_gpio(COLIBRI_PXA270_ETH_IRQ_GPIO)) |
14 | |||
15 | /* Ethernet Controller Davicom DM9000 */ | ||
16 | #define GPIO_DM9000 114 | ||
17 | #define COLIBRI_ETH_IRQ IRQ_GPIO(GPIO_DM9000) | ||
18 | 12 | ||
19 | #endif /* _COLIBRI_H_ */ | 13 | #endif /* _COLIBRI_H_ */ |
14 | |||