diff options
-rw-r--r-- | arch/arm/mach-ixp4xx/coyote-pci.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/coyote.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/irqs.h | 7 |
5 files changed, 19 insertions, 43 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c index efddf01ed17b..624f8fe83c45 100644 --- a/arch/arm/mach-ixp4xx/coyote-pci.c +++ b/arch/arm/mach-ixp4xx/coyote-pci.c | |||
@@ -18,13 +18,21 @@ | |||
18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | |||
22 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
23 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
24 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
25 | |||
26 | #include <asm/mach/pci.h> | 24 | #include <asm/mach/pci.h> |
27 | 25 | ||
26 | #define COYOTE_PCI_SLOT0_DEVID 14 | ||
27 | #define COYOTE_PCI_SLOT1_DEVID 15 | ||
28 | |||
29 | /* PCI controller GPIO to IRQ pin mappings */ | ||
30 | #define COYOTE_PCI_SLOT0_PIN 6 | ||
31 | #define COYOTE_PCI_SLOT1_PIN 11 | ||
32 | |||
33 | #define IRQ_COYOTE_PCI_SLOT0 IRQ_IXP4XX_GPIO6 | ||
34 | #define IRQ_COYOTE_PCI_SLOT1 IRQ_IXP4XX_GPIO11 | ||
35 | |||
28 | void __init coyote_pci_preinit(void) | 36 | void __init coyote_pci_preinit(void) |
29 | { | 37 | { |
30 | set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW); | 38 | set_irq_type(IRQ_COYOTE_PCI_SLOT0, IRQ_TYPE_LEVEL_LOW); |
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index aab1954e2747..25bf5ad770ea 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
@@ -25,6 +25,15 @@ | |||
25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
26 | #include <asm/mach/flash.h> | 26 | #include <asm/mach/flash.h> |
27 | 27 | ||
28 | #define COYOTE_IDE_BASE_PHYS IXP4XX_EXP_BUS_BASE(3) | ||
29 | #define COYOTE_IDE_BASE_VIRT 0xFFFE1000 | ||
30 | #define COYOTE_IDE_REGION_SIZE 0x1000 | ||
31 | |||
32 | #define COYOTE_IDE_DATA_PORT 0xFFFE10E0 | ||
33 | #define COYOTE_IDE_CTRL_PORT 0xFFFE10FC | ||
34 | #define COYOTE_IDE_ERROR_PORT 0xFFFE10E2 | ||
35 | #define IRQ_COYOTE_IDE IRQ_IXP4XX_GPIO5 | ||
36 | |||
28 | static struct flash_platform_data coyote_flash_data = { | 37 | static struct flash_platform_data coyote_flash_data = { |
29 | .map_name = "cfi_probe", | 38 | .map_name = "cfi_probe", |
30 | .width = 2, | 39 | .width = 2, |
diff --git a/arch/arm/mach-ixp4xx/include/mach/coyote.h b/arch/arm/mach-ixp4xx/include/mach/coyote.h deleted file mode 100644 index 717ac6d16f55..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/coyote.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ixp4xx/include/mach/coyote.h | ||
3 | * | ||
4 | * ADI Engineering platform specific definitions | ||
5 | * | ||
6 | * Author: Deepak Saxena <dsaxena@plexity.net> | ||
7 | * | ||
8 | * Copyright 2004 (c) MontaVista, Software, Inc. | ||
9 | * | ||
10 | * This file is licensed under the terms of the GNU General Public | ||
11 | * License version 2. This program is licensed "as is" without any | ||
12 | * warranty of any kind, whether express or implied. | ||
13 | */ | ||
14 | |||
15 | #ifndef __ASM_ARCH_HARDWARE_H__ | ||
16 | #error "Do not include this directly, instead #include <mach/hardware.h>" | ||
17 | #endif | ||
18 | |||
19 | /* PCI controller GPIO to IRQ pin mappings */ | ||
20 | #define COYOTE_PCI_SLOT0_PIN 6 | ||
21 | #define COYOTE_PCI_SLOT1_PIN 11 | ||
22 | |||
23 | #define COYOTE_PCI_SLOT0_DEVID 14 | ||
24 | #define COYOTE_PCI_SLOT1_DEVID 15 | ||
25 | |||
26 | #define COYOTE_IDE_BASE_PHYS IXP4XX_EXP_BUS_BASE(3) | ||
27 | #define COYOTE_IDE_BASE_VIRT 0xFFFE1000 | ||
28 | #define COYOTE_IDE_REGION_SIZE 0x1000 | ||
29 | |||
30 | #define COYOTE_IDE_DATA_PORT 0xFFFE10E0 | ||
31 | #define COYOTE_IDE_CTRL_PORT 0xFFFE10FC | ||
32 | #define COYOTE_IDE_ERROR_PORT 0xFFFE10E2 | ||
33 | |||
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index 72b75438f747..1fbed65731a8 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 "coyote.h" | ||
48 | #include "prpmc1100.h" | 47 | #include "prpmc1100.h" |
49 | #include "nslu2.h" | 48 | #include "nslu2.h" |
50 | #include "nas100d.h" | 49 | #include "nas100d.h" |
diff --git a/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h index 5cb19fe10ed9..e4c6ccaebbfc 100644 --- a/arch/arm/mach-ixp4xx/include/mach/irqs.h +++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h | |||
@@ -79,13 +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 | * ADI Coyote Board IRQs | ||
83 | */ | ||
84 | #define IRQ_COYOTE_PCI_SLOT0 IRQ_IXP4XX_GPIO6 | ||
85 | #define IRQ_COYOTE_PCI_SLOT1 IRQ_IXP4XX_GPIO11 | ||
86 | #define IRQ_COYOTE_IDE IRQ_IXP4XX_GPIO5 | ||
87 | |||
88 | /* | ||
89 | * NSLU2 board IRQs | 82 | * NSLU2 board IRQs |
90 | */ | 83 | */ |
91 | #define IRQ_NSLU2_PCI_INTA IRQ_IXP4XX_GPIO11 | 84 | #define IRQ_NSLU2_PCI_INTA IRQ_IXP4XX_GPIO11 |