diff options
author | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-11-16 09:39:11 -0500 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-12-05 10:58:39 -0500 |
commit | ec66969685ecf04e8a5036369702fa9aec07cc17 (patch) | |
tree | 92d0310bf846c8e668888da4a93307dfd6050b46 /arch/arm/mach-ixp4xx/include | |
parent | 9bf4d676898b1f083a7ee20a0c6aacf2886eb49d (diff) |
IXP4xx: move AVILA platform macros to the platform code.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include')
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/avila.h | 39 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/irqs.h | 9 |
3 files changed, 0 insertions, 49 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/avila.h b/arch/arm/mach-ixp4xx/include/mach/avila.h deleted file mode 100644 index 1640cb61972b..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/avila.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ixp4xx/include/mach/avila.h | ||
3 | * | ||
4 | * Gateworks Avila platform specific definitions | ||
5 | * | ||
6 | * Author: Michael-Luke Jones <mlj28@cam.ac.uk> | ||
7 | * | ||
8 | * Based on ixdp425.h | ||
9 | * Author: Deepak Saxena <dsaxena@plexity.net> | ||
10 | * | ||
11 | * Copyright 2004 (c) MontaVista, Software, Inc. | ||
12 | * | ||
13 | * This file is licensed under the terms of the GNU General Public | ||
14 | * License version 2. This program is licensed "as is" without any | ||
15 | * warranty of any kind, whether express or implied. | ||
16 | */ | ||
17 | |||
18 | #ifndef __ASM_ARCH_HARDWARE_H__ | ||
19 | #error "Do not include this directly, instead #include <mach/hardware.h>" | ||
20 | #endif | ||
21 | |||
22 | #define AVILA_SDA_PIN 7 | ||
23 | #define AVILA_SCL_PIN 6 | ||
24 | |||
25 | /* | ||
26 | * AVILA PCI IRQs | ||
27 | */ | ||
28 | #define AVILA_PCI_MAX_DEV 4 | ||
29 | #define LOFT_PCI_MAX_DEV 6 | ||
30 | #define AVILA_PCI_IRQ_LINES 4 | ||
31 | |||
32 | |||
33 | /* PCI controller GPIO to IRQ pin mappings */ | ||
34 | #define AVILA_PCI_INTA_PIN 11 | ||
35 | #define AVILA_PCI_INTB_PIN 10 | ||
36 | #define AVILA_PCI_INTC_PIN 9 | ||
37 | #define AVILA_PCI_INTD_PIN 8 | ||
38 | |||
39 | |||
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index 30ca67bf7093..72b75438f747 100644 --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h | |||
@@ -44,7 +44,6 @@ | |||
44 | #include "platform.h" | 44 | #include "platform.h" |
45 | 45 | ||
46 | /* Platform specific details */ | 46 | /* Platform specific details */ |
47 | #include "avila.h" | ||
48 | #include "coyote.h" | 47 | #include "coyote.h" |
49 | #include "prpmc1100.h" | 48 | #include "prpmc1100.h" |
50 | #include "nslu2.h" | 49 | #include "nslu2.h" |
diff --git a/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h index 4bb6d6645563..5cb19fe10ed9 100644 --- a/arch/arm/mach-ixp4xx/include/mach/irqs.h +++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h | |||
@@ -71,15 +71,6 @@ | |||
71 | #define XSCALE_PMU_IRQ (IRQ_IXP4XX_XSCALE_PMU) | 71 | #define XSCALE_PMU_IRQ (IRQ_IXP4XX_XSCALE_PMU) |
72 | 72 | ||
73 | /* | 73 | /* |
74 | * Gateworks Avila board IRQs | ||
75 | */ | ||
76 | #define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11 | ||
77 | #define IRQ_AVILA_PCI_INTB IRQ_IXP4XX_GPIO10 | ||
78 | #define IRQ_AVILA_PCI_INTC IRQ_IXP4XX_GPIO9 | ||
79 | #define IRQ_AVILA_PCI_INTD IRQ_IXP4XX_GPIO8 | ||
80 | |||
81 | |||
82 | /* | ||
83 | * PrPMC1100 Board IRQs | 74 | * PrPMC1100 Board IRQs |
84 | */ | 75 | */ |
85 | #define IRQ_PRPMC1100_PCI_INTA IRQ_IXP4XX_GPIO11 | 76 | #define IRQ_PRPMC1100_PCI_INTA IRQ_IXP4XX_GPIO11 |