diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-09-20 15:56:02 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-09-27 08:37:55 -0400 |
commit | d48f1de2d8170814fb64effa320848410c466f95 (patch) | |
tree | 24aae2fe37aa995b49a30e050a6c323b3c41fd27 /arch/mips/pci | |
parent | 432bef2a31668a0562e5738eaa59a43854f26567 (diff) |
[MIPS] Remove EV96100 as previously announced.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/pci/fixup-ev96100.c | 48 | ||||
-rw-r--r-- | arch/mips/pci/ops-gt96100.c | 169 | ||||
-rw-r--r-- | arch/mips/pci/pci-ev96100.c | 63 |
4 files changed, 0 insertions, 282 deletions
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 368d3d896165..edefa97b2330 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -11,7 +11,6 @@ obj-$(CONFIG_ITE_BOARD_GEN) += ops-it8172.o | |||
11 | obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o | 11 | obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o |
12 | obj-$(CONFIG_MIPS_GT64111) += ops-gt64111.o | 12 | obj-$(CONFIG_MIPS_GT64111) += ops-gt64111.o |
13 | obj-$(CONFIG_MIPS_GT64120) += ops-gt64120.o | 13 | obj-$(CONFIG_MIPS_GT64120) += ops-gt64120.o |
14 | obj-$(CONFIG_MIPS_GT96100) += ops-gt96100.o | ||
15 | obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o | 14 | obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o |
16 | obj-$(CONFIG_MIPS_MSC) += ops-msc.o | 15 | obj-$(CONFIG_MIPS_MSC) += ops-msc.o |
17 | obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o | 16 | obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o |
@@ -29,7 +28,6 @@ obj-$(CONFIG_LASAT) += pci-lasat.o | |||
29 | obj-$(CONFIG_MIPS_ATLAS) += fixup-atlas.o | 28 | obj-$(CONFIG_MIPS_ATLAS) += fixup-atlas.o |
30 | obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o | 29 | obj-$(CONFIG_MIPS_COBALT) += fixup-cobalt.o |
31 | obj-$(CONFIG_MIPS_EV64120) += fixup-ev64120.o | 30 | obj-$(CONFIG_MIPS_EV64120) += fixup-ev64120.o |
32 | obj-$(CONFIG_MIPS_EV96100) += fixup-ev96100.o pci-ev96100.o | ||
33 | obj-$(CONFIG_MIPS_ITE8172) += fixup-ite8172g.o | 31 | obj-$(CONFIG_MIPS_ITE8172) += fixup-ite8172g.o |
34 | obj-$(CONFIG_MIPS_IVR) += fixup-ivr.o | 32 | obj-$(CONFIG_MIPS_IVR) += fixup-ivr.o |
35 | obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o | 33 | obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o |
diff --git a/arch/mips/pci/fixup-ev96100.c b/arch/mips/pci/fixup-ev96100.c deleted file mode 100644 index e2bc977b6d58..000000000000 --- a/arch/mips/pci/fixup-ev96100.c +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * BRIEF MODULE DESCRIPTION | ||
4 | * EV96100 Board specific pci fixups. | ||
5 | * | ||
6 | * Copyright 2001 MontaVista Software Inc. | ||
7 | * Author: MontaVista Software, Inc. | ||
8 | * ppopov@mvista.com or source@mvista.com | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify it | ||
11 | * under the terms of the GNU General Public License as published by the | ||
12 | * Free Software Foundation; either version 2 of the License, or (at your | ||
13 | * option) any later version. | ||
14 | * | ||
15 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
16 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
17 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
18 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
21 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
22 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | * | ||
26 | * You should have received a copy of the GNU General Public License along | ||
27 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
29 | */ | ||
30 | #include <linux/init.h> | ||
31 | #include <linux/types.h> | ||
32 | #include <linux/pci.h> | ||
33 | |||
34 | static char irq_tab_ev96100[][5] __initdata = { | ||
35 | [8] = { 0, 5, 5, 5, 5 }, | ||
36 | [9] = { 0, 2, 2, 2, 2 } | ||
37 | }; | ||
38 | |||
39 | int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | ||
40 | { | ||
41 | return irq_tab_ev96100[slot][pin]; | ||
42 | } | ||
43 | |||
44 | /* Do platform specific device initialization at pci_enable_device() time */ | ||
45 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
46 | { | ||
47 | return 0; | ||
48 | } | ||
diff --git a/arch/mips/pci/ops-gt96100.c b/arch/mips/pci/ops-gt96100.c deleted file mode 100644 index 9e4ea6627e21..000000000000 --- a/arch/mips/pci/ops-gt96100.c +++ /dev/null | |||
@@ -1,169 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * BRIEF MODULE DESCRIPTION | ||
4 | * Galileo EV96100 board specific pci support. | ||
5 | * | ||
6 | * Copyright 2000 MontaVista Software Inc. | ||
7 | * Author: MontaVista Software, Inc. | ||
8 | * ppopov@mvista.com or source@mvista.com | ||
9 | * | ||
10 | * This file was derived from Carsten Langgaard's | ||
11 | * arch/mips/mips-boards/generic/pci.c | ||
12 | * | ||
13 | * Carsten Langgaard, carstenl@mips.com | ||
14 | * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. | ||
15 | * | ||
16 | * This program is free software; you can redistribute it and/or modify it | ||
17 | * under the terms of the GNU General Public License as published by the | ||
18 | * Free Software Foundation; either version 2 of the License, or (at your | ||
19 | * option) any later version. | ||
20 | * | ||
21 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
22 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
23 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
24 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
25 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
26 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
27 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
28 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
29 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
30 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
31 | * | ||
32 | * You should have received a copy of the GNU General Public License along | ||
33 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
34 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
35 | */ | ||
36 | #include <linux/types.h> | ||
37 | #include <linux/pci.h> | ||
38 | #include <linux/kernel.h> | ||
39 | #include <linux/init.h> | ||
40 | |||
41 | #include <asm/delay.h> | ||
42 | #include <asm/gt64120.h> | ||
43 | #include <asm/galileo-boards/ev96100.h> | ||
44 | |||
45 | #define PCI_ACCESS_READ 0 | ||
46 | #define PCI_ACCESS_WRITE 1 | ||
47 | |||
48 | static int static gt96100_config_access(unsigned char access_type, | ||
49 | struct pci_bus *bus, unsigned int devfn, int where, u32 * data) | ||
50 | { | ||
51 | unsigned char bus = bus->number; | ||
52 | u32 intr; | ||
53 | |||
54 | /* | ||
55 | * Because of a bug in the galileo (for slot 31). | ||
56 | */ | ||
57 | if (bus == 0 && devfn >= PCI_DEVFN(31, 0)) | ||
58 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
59 | |||
60 | /* Clear cause register bits */ | ||
61 | GT_WRITE(GT_INTRCAUSE_OFS, ~(GT_INTRCAUSE_MASABORT0_BIT | | ||
62 | GT_INTRCAUSE_TARABORT0_BIT)); | ||
63 | |||
64 | /* Setup address */ | ||
65 | GT_WRITE(GT_PCI0_CFGADDR_OFS, | ||
66 | (bus << GT_PCI0_CFGADDR_BUSNUM_SHF) | | ||
67 | (devfn << GT_PCI0_CFGADDR_FUNCTNUM_SHF) | | ||
68 | ((where / 4) << GT_PCI0_CFGADDR_REGNUM_SHF) | | ||
69 | GT_PCI0_CFGADDR_CONFIGEN_BIT); | ||
70 | udelay(2); | ||
71 | |||
72 | |||
73 | if (access_type == PCI_ACCESS_WRITE) { | ||
74 | if (devfn != 0) | ||
75 | *data = le32_to_cpu(*data); | ||
76 | GT_WRITE(GT_PCI0_CFGDATA_OFS, *data); | ||
77 | } else { | ||
78 | *data = GT_READ(GT_PCI0_CFGDATA_OFS); | ||
79 | if (devfn != 0) | ||
80 | *data = le32_to_cpu(*data); | ||
81 | } | ||
82 | |||
83 | udelay(2); | ||
84 | |||
85 | /* Check for master or target abort */ | ||
86 | intr = GT_READ(GT_INTRCAUSE_OFS); | ||
87 | |||
88 | if (intr & (GT_INTRCAUSE_MASABORT0_BIT | GT_INTRCAUSE_TARABORT0_BIT)) { | ||
89 | /* Error occured */ | ||
90 | |||
91 | /* Clear bits */ | ||
92 | GT_WRITE(GT_INTRCAUSE_OFS, ~(GT_INTRCAUSE_MASABORT0_BIT | | ||
93 | GT_INTRCAUSE_TARABORT0_BIT)); | ||
94 | return -1; | ||
95 | } | ||
96 | return 0; | ||
97 | } | ||
98 | |||
99 | /* | ||
100 | * We can't address 8 and 16 bit words directly. Instead we have to | ||
101 | * read/write a 32bit word and mask/modify the data we actually want. | ||
102 | */ | ||
103 | static int gt96100_pcibios_read(struct pci_bus *bus, unsigned int devfn, | ||
104 | int where, int size, u32 * val) | ||
105 | { | ||
106 | u32 data = 0; | ||
107 | |||
108 | if (gt96100_config_access(PCI_ACCESS_READ, bus, devfn, where, &data)) | ||
109 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
110 | |||
111 | switch (size) { | ||
112 | case 1: | ||
113 | *val = (data >> ((where & 3) << 3)) & 0xff; | ||
114 | break; | ||
115 | |||
116 | case 2: | ||
117 | *val = (data >> ((where & 3) << 3)) & 0xffff; | ||
118 | break; | ||
119 | |||
120 | case 4: | ||
121 | *val = data; | ||
122 | break; | ||
123 | } | ||
124 | return PCIBIOS_SUCCESSFUL; | ||
125 | } | ||
126 | |||
127 | static int gt96100_pcibios_write(struct pci_bus *bus, unsigned int devfn, | ||
128 | int where, int size, u32 val) | ||
129 | { | ||
130 | u32 data = 0; | ||
131 | |||
132 | switch (size) { | ||
133 | case 1: | ||
134 | if (gt96100_config_access(PCI_ACCESS_READ, bus, devfn, where, &data)) | ||
135 | return -1; | ||
136 | |||
137 | data = (data & ~(0xff << ((where & 3) << 3))) | | ||
138 | (val << ((where & 3) << 3)); | ||
139 | |||
140 | if (gt96100_config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data)) | ||
141 | return -1; | ||
142 | |||
143 | return PCIBIOS_SUCCESSFUL; | ||
144 | |||
145 | case 2: | ||
146 | if (gt96100_config_access(PCI_ACCESS_READ, bus, devfn, where, &data)) | ||
147 | return -1; | ||
148 | |||
149 | data = (data & ~(0xffff << ((where & 3) << 3))) | | ||
150 | (val << ((where & 3) << 3)); | ||
151 | |||
152 | if (gt96100_config_access(PCI_ACCESS_WRITE, dev, where, &data)) | ||
153 | return -1; | ||
154 | |||
155 | |||
156 | return PCIBIOS_SUCCESSFUL; | ||
157 | |||
158 | case 4: | ||
159 | if (gt96100_config_access(PCI_ACCESS_WRITE, dev, where, &val)) | ||
160 | return -1; | ||
161 | |||
162 | return PCIBIOS_SUCCESSFUL; | ||
163 | } | ||
164 | } | ||
165 | |||
166 | struct pci_ops gt96100_pci_ops = { | ||
167 | .read = gt96100_pcibios_read, | ||
168 | .write = gt96100_pcibios_write | ||
169 | }; | ||
diff --git a/arch/mips/pci/pci-ev96100.c b/arch/mips/pci/pci-ev96100.c deleted file mode 100644 index f9457ea00def..000000000000 --- a/arch/mips/pci/pci-ev96100.c +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2000 MontaVista Software Inc. | ||
3 | * Author: MontaVista Software, Inc. | ||
4 | * ppopov@mvista.com or source@mvista.com | ||
5 | * | ||
6 | * Carsten Langgaard, carstenl@mips.com | ||
7 | * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. | ||
8 | * | ||
9 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify it | ||
12 | * under the terms of the GNU General Public License as published by the | ||
13 | * Free Software Foundation; either version 2 of the License, or (at your | ||
14 | * option) any later version. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
17 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
18 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
19 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
22 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
23 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | * You should have received a copy of the GNU General Public License along | ||
28 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
29 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
30 | */ | ||
31 | #include <linux/types.h> | ||
32 | #include <linux/pci.h> | ||
33 | #include <linux/kernel.h> | ||
34 | #include <linux/init.h> | ||
35 | |||
36 | static struct resource pci_io_resource = { | ||
37 | .name = "io pci IO space", | ||
38 | .start = 0x10000000, | ||
39 | .end = 0x11ffffff, | ||
40 | .flags = IORESOURCE_IO | ||
41 | }; | ||
42 | |||
43 | static struct resource pci_mem_resource = { | ||
44 | .name = "ext pci memory space", | ||
45 | .start = 0x12000000, | ||
46 | .end = 0x13ffffff, | ||
47 | .flags = IORESOURCE_MEM | ||
48 | }; | ||
49 | |||
50 | extern struct pci_ops gt96100_pci_ops; | ||
51 | |||
52 | struct pci_controller ev96100_controller = { | ||
53 | .pci_ops = >96100_pci_ops, | ||
54 | .io_resource = &pci_io_resource, | ||
55 | .mem_resource = &pci_mem_resource, | ||
56 | }; | ||
57 | |||
58 | static void ev96100_pci_init(void) | ||
59 | { | ||
60 | register_pci_controller(&ev96100_controller); | ||
61 | } | ||
62 | |||
63 | arch_initcall(ev96100_pci_init); | ||