diff options
author | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-11-16 10:06:47 -0500 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-12-05 10:58:39 -0500 |
commit | 23fa6846a2e2ac6fcb6529f047570244ecbd957c (patch) | |
tree | c3d11462ad84b5f154fd85cac71390dd6618bea6 /arch/arm/mach-ixp4xx/include | |
parent | c1117c63d53cc269193d02383b4275ae5c4cbe49 (diff) |
IXP4xx: move NAS100D 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/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/irqs.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/nas100d.h | 52 |
3 files changed, 0 insertions, 62 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index b949cd20091..05db6357661 100644 --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h | |||
@@ -45,7 +45,6 @@ | |||
45 | 45 | ||
46 | /* Platform specific details */ | 46 | /* Platform specific details */ |
47 | #include "prpmc1100.h" | 47 | #include "prpmc1100.h" |
48 | #include "nas100d.h" | ||
49 | #include "dsmg600.h" | 48 | #include "dsmg600.h" |
50 | #include "fsg.h" | 49 | #include "fsg.h" |
51 | 50 | ||
diff --git a/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h index b7e372ede24..dff26af20ab 100644 --- a/arch/arm/mach-ixp4xx/include/mach/irqs.h +++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h | |||
@@ -79,15 +79,6 @@ | |||
79 | #define IRQ_PRPMC1100_PCI_INTD IRQ_IXP4XX_GPIO8 | 79 | #define IRQ_PRPMC1100_PCI_INTD IRQ_IXP4XX_GPIO8 |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * NAS100D board IRQs | ||
83 | */ | ||
84 | #define IRQ_NAS100D_PCI_INTA IRQ_IXP4XX_GPIO11 | ||
85 | #define IRQ_NAS100D_PCI_INTB IRQ_IXP4XX_GPIO10 | ||
86 | #define IRQ_NAS100D_PCI_INTC IRQ_IXP4XX_GPIO9 | ||
87 | #define IRQ_NAS100D_PCI_INTD IRQ_IXP4XX_GPIO8 | ||
88 | #define IRQ_NAS100D_PCI_INTE IRQ_IXP4XX_GPIO7 | ||
89 | |||
90 | /* | ||
91 | * D-Link DSM-G600 RevA board IRQs | 82 | * D-Link DSM-G600 RevA board IRQs |
92 | */ | 83 | */ |
93 | #define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11 | 84 | #define IRQ_DSMG600_PCI_INTA IRQ_IXP4XX_GPIO11 |
diff --git a/arch/arm/mach-ixp4xx/include/mach/nas100d.h b/arch/arm/mach-ixp4xx/include/mach/nas100d.h deleted file mode 100644 index 3771d62a974..00000000000 --- a/arch/arm/mach-ixp4xx/include/mach/nas100d.h +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ixp4xx/include/mach/nas100d.h | ||
3 | * | ||
4 | * NAS100D platform specific definitions | ||
5 | * | ||
6 | * Copyright (c) 2005 Tower Technologies | ||
7 | * | ||
8 | * Author: Alessandro Zummo <a.zummo@towertech.it> | ||
9 | * | ||
10 | * based on ixdp425.h: | ||
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 NAS100D_SDA_PIN 5 | ||
23 | #define NAS100D_SCL_PIN 6 | ||
24 | |||
25 | /* | ||
26 | * NAS100D PCI IRQs | ||
27 | */ | ||
28 | #define NAS100D_PCI_MAX_DEV 3 | ||
29 | #define NAS100D_PCI_IRQ_LINES 3 | ||
30 | |||
31 | |||
32 | /* PCI controller GPIO to IRQ pin mappings */ | ||
33 | #define NAS100D_PCI_INTA_PIN 11 | ||
34 | #define NAS100D_PCI_INTB_PIN 10 | ||
35 | #define NAS100D_PCI_INTC_PIN 9 | ||
36 | #define NAS100D_PCI_INTD_PIN 8 | ||
37 | #define NAS100D_PCI_INTE_PIN 7 | ||
38 | |||
39 | /* Buttons */ | ||
40 | |||
41 | #define NAS100D_PB_GPIO 14 /* power button */ | ||
42 | #define NAS100D_RB_GPIO 4 /* reset button */ | ||
43 | |||
44 | /* Power control */ | ||
45 | |||
46 | #define NAS100D_PO_GPIO 12 /* power off */ | ||
47 | |||
48 | /* LEDs */ | ||
49 | |||
50 | #define NAS100D_LED_WLAN_GPIO 0 | ||
51 | #define NAS100D_LED_DISK_GPIO 3 | ||
52 | #define NAS100D_LED_PWR_GPIO 15 | ||