diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/irqs.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/ixdp425.h | 39 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-pci.c | 17 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 12 |
5 files changed, 25 insertions, 52 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index f822b223b7e0..30ca67bf7093 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 "ixdp425.h" | ||
48 | #include "avila.h" | 47 | #include "avila.h" |
49 | #include "coyote.h" | 48 | #include "coyote.h" |
50 | #include "prpmc1100.h" | 49 | #include "prpmc1100.h" |
diff --git a/arch/arm/mach-ixp4xx/include/mach/irqs.h b/arch/arm/mach-ixp4xx/include/mach/irqs.h index f4d74de1566a..4bb6d6645563 100644 --- a/arch/arm/mach-ixp4xx/include/mach/irqs.h +++ b/arch/arm/mach-ixp4xx/include/mach/irqs.h | |||
@@ -71,14 +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 | * IXDP425 board IRQs | ||
75 | */ | ||
76 | #define IRQ_IXDP425_PCI_INTA IRQ_IXP4XX_GPIO11 | ||
77 | #define IRQ_IXDP425_PCI_INTB IRQ_IXP4XX_GPIO10 | ||
78 | #define IRQ_IXDP425_PCI_INTC IRQ_IXP4XX_GPIO9 | ||
79 | #define IRQ_IXDP425_PCI_INTD IRQ_IXP4XX_GPIO8 | ||
80 | |||
81 | /* | ||
82 | * Gateworks Avila board IRQs | 74 | * Gateworks Avila board IRQs |
83 | */ | 75 | */ |
84 | #define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11 | 76 | #define IRQ_AVILA_PCI_INTA IRQ_IXP4XX_GPIO11 |
diff --git a/arch/arm/mach-ixp4xx/include/mach/ixdp425.h b/arch/arm/mach-ixp4xx/include/mach/ixdp425.h deleted file mode 100644 index 2cafe65ebfee..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/ixdp425.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-ixp4xx/include/mach/ixdp425.h | ||
3 | * | ||
4 | * IXDP425 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 | #define IXDP425_SDA_PIN 7 | ||
20 | #define IXDP425_SCL_PIN 6 | ||
21 | |||
22 | /* | ||
23 | * IXDP425 PCI IRQs | ||
24 | */ | ||
25 | #define IXDP425_PCI_MAX_DEV 4 | ||
26 | #define IXDP425_PCI_IRQ_LINES 4 | ||
27 | |||
28 | |||
29 | /* PCI controller GPIO to IRQ pin mappings */ | ||
30 | #define IXDP425_PCI_INTA_PIN 11 | ||
31 | #define IXDP425_PCI_INTB_PIN 10 | ||
32 | #define IXDP425_PCI_INTC_PIN 9 | ||
33 | #define IXDP425_PCI_INTD_PIN 8 | ||
34 | |||
35 | /* NAND Flash pins */ | ||
36 | #define IXDP425_NAND_NCE_PIN 12 | ||
37 | |||
38 | #define IXDP425_NAND_CMD_BYTE 0x01 | ||
39 | #define IXDP425_NAND_ADDR_BYTE 0x02 | ||
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index 64c29aacaac9..dc8b5884875c 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 | * arch/arm/mach-ixp4xx/ixdp425-pci.c |
3 | * | 3 | * |
4 | * IXDP425 board-level PCI initialization | 4 | * IXDP425 board-level PCI initialization |
5 | * | 5 | * |
@@ -19,12 +19,25 @@ | |||
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | |||
23 | #include <asm/mach/pci.h> | 22 | #include <asm/mach/pci.h> |
24 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
25 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
26 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
27 | 26 | ||
27 | #define IXDP425_PCI_MAX_DEV 4 | ||
28 | #define IXDP425_PCI_IRQ_LINES 4 | ||
29 | |||
30 | /* PCI controller GPIO to IRQ pin mappings */ | ||
31 | #define IXDP425_PCI_INTA_PIN 11 | ||
32 | #define IXDP425_PCI_INTB_PIN 10 | ||
33 | #define IXDP425_PCI_INTC_PIN 9 | ||
34 | #define IXDP425_PCI_INTD_PIN 8 | ||
35 | |||
36 | #define IRQ_IXDP425_PCI_INTA IRQ_IXP4XX_GPIO11 | ||
37 | #define IRQ_IXDP425_PCI_INTB IRQ_IXP4XX_GPIO10 | ||
38 | #define IRQ_IXDP425_PCI_INTC IRQ_IXP4XX_GPIO9 | ||
39 | #define IRQ_IXDP425_PCI_INTD IRQ_IXP4XX_GPIO8 | ||
40 | |||
28 | void __init ixdp425_pci_preinit(void) | 41 | void __init ixdp425_pci_preinit(void) |
29 | { | 42 | { |
30 | set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW); | 43 | set_irq_type(IRQ_IXDP425_PCI_INTA, IRQ_TYPE_LEVEL_LOW); |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index f4a0c1bc1331..bbb768988845 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 | * arch/arm/mach-ixp4xx/ixdp425-setup.c |
3 | * | 3 | * |
4 | * IXDP425/IXCDP1100 board-setup | 4 | * IXDP425/IXCDP1100 board-setup |
5 | * | 5 | * |
6 | * Copyright (C) 2003-2005 MontaVista Software, Inc. | 6 | * Copyright (C) 2003-2005 MontaVista Software, Inc. |
7 | * | 7 | * |
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/mtd/nand.h> | 21 | #include <linux/mtd/nand.h> |
22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | |||
25 | #include <asm/types.h> | 24 | #include <asm/types.h> |
26 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
27 | #include <asm/memory.h> | 26 | #include <asm/memory.h> |
@@ -31,6 +30,15 @@ | |||
31 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/flash.h> | 31 | #include <asm/mach/flash.h> |
33 | 32 | ||
33 | #define IXDP425_SDA_PIN 7 | ||
34 | #define IXDP425_SCL_PIN 6 | ||
35 | |||
36 | /* NAND Flash pins */ | ||
37 | #define IXDP425_NAND_NCE_PIN 12 | ||
38 | |||
39 | #define IXDP425_NAND_CMD_BYTE 0x01 | ||
40 | #define IXDP425_NAND_ADDR_BYTE 0x02 | ||
41 | |||
34 | static struct flash_platform_data ixdp425_flash_data = { | 42 | static struct flash_platform_data ixdp425_flash_data = { |
35 | .map_name = "cfi_probe", | 43 | .map_name = "cfi_probe", |
36 | .width = 2, | 44 | .width = 2, |