diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-09 11:29:16 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:05 -0400 |
commit | 688b3d720820a9e3e2e9d5882be64a28f649e206 (patch) | |
tree | 7181045ae55f69966e8237439a215242e9714ff4 /arch/mips/pci | |
parent | c99cabf034d42c9e4a9c1ed9dfd26411b2fb9b57 (diff) |
[MIPS] Delete Ocelot 3 support.
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-ocelot3.c | 41 | ||||
-rw-r--r-- | arch/mips/pci/ops-marvell.c | 93 |
3 files changed, 0 insertions, 136 deletions
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index cfebf58c8dc..f26ede001a0 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -9,7 +9,6 @@ obj-y += pci.o pci-dac.o | |||
9 | # | 9 | # |
10 | obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o | 10 | obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o |
11 | obj-$(CONFIG_PCI_GT64XXX_PCI0) += ops-gt64xxx_pci0.o | 11 | obj-$(CONFIG_PCI_GT64XXX_PCI0) += ops-gt64xxx_pci0.o |
12 | obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o | ||
13 | obj-$(CONFIG_MIPS_MSC) += ops-msc.o | 12 | obj-$(CONFIG_MIPS_MSC) += ops-msc.o |
14 | obj-$(CONFIG_MIPS_TX3927) += ops-tx3927.o | 13 | obj-$(CONFIG_MIPS_TX3927) += ops-tx3927.o |
15 | obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o | 14 | obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o |
@@ -29,7 +28,6 @@ obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o | |||
29 | obj-$(CONFIG_LEMOTE_FULONG) += fixup-lm2e.o ops-bonito64.o | 28 | obj-$(CONFIG_LEMOTE_FULONG) += fixup-lm2e.o ops-bonito64.o |
30 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o | 29 | obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o |
31 | obj-$(CONFIG_MOMENCO_OCELOT) += fixup-ocelot.o pci-ocelot.o | 30 | obj-$(CONFIG_MOMENCO_OCELOT) += fixup-ocelot.o pci-ocelot.o |
32 | obj-$(CONFIG_MOMENCO_OCELOT_3) += fixup-ocelot3.o | ||
33 | obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o | 31 | obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o |
34 | obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o | 32 | obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o |
35 | obj-$(CONFIG_PMC_MSP7120_FPGA) += fixup-pmcmsp.o ops-pmcmsp.o | 33 | obj-$(CONFIG_PMC_MSP7120_FPGA) += fixup-pmcmsp.o ops-pmcmsp.o |
diff --git a/arch/mips/pci/fixup-ocelot3.c b/arch/mips/pci/fixup-ocelot3.c deleted file mode 100644 index 702f997b867..00000000000 --- a/arch/mips/pci/fixup-ocelot3.c +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2004 Montavista Software Inc. | ||
7 | * Author: Manish Lachwani (mlachwani@mvista.com) | ||
8 | * | ||
9 | * Looking at the schematics for the Ocelot-3 board, there are | ||
10 | * two PCI busses and each bus has two PCI slots. | ||
11 | */ | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/pci.h> | ||
15 | #include <asm/mipsregs.h> | ||
16 | |||
17 | /* | ||
18 | * Do platform specific device initialization at | ||
19 | * pci_enable_device() time | ||
20 | */ | ||
21 | int pcibios_plat_dev_init(struct pci_dev *dev) | ||
22 | { | ||
23 | return 0; | ||
24 | } | ||
25 | |||
26 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
27 | { | ||
28 | int bus = dev->bus->number; | ||
29 | |||
30 | if (bus == 0 && slot == 1) | ||
31 | return 2; /* PCI-X A */ | ||
32 | if (bus == 0 && slot == 2) | ||
33 | return 3; /* PCI-X B */ | ||
34 | if (bus == 1 && slot == 1) | ||
35 | return 4; /* PCI A */ | ||
36 | if (bus == 1 && slot == 2) | ||
37 | return 5; /* PCI B */ | ||
38 | |||
39 | return 0; | ||
40 | panic("Whooops in pcibios_map_irq"); | ||
41 | } | ||
diff --git a/arch/mips/pci/ops-marvell.c b/arch/mips/pci/ops-marvell.c deleted file mode 100644 index 1ac5c59199d..00000000000 --- a/arch/mips/pci/ops-marvell.c +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2003, 2004 Ralf Baechle (ralf@linux-mips.org) | ||
7 | */ | ||
8 | #include <linux/kernel.h> | ||
9 | #include <linux/types.h> | ||
10 | #include <linux/pci.h> | ||
11 | |||
12 | #include <asm/marvell.h> | ||
13 | |||
14 | static int mv_read_config(struct pci_bus *bus, unsigned int devfn, | ||
15 | int where, int size, u32 * val) | ||
16 | { | ||
17 | struct mv_pci_controller *mvbc = bus->sysdata; | ||
18 | unsigned long address_reg, data_reg; | ||
19 | u32 address; | ||
20 | |||
21 | address_reg = mvbc->config_addr; | ||
22 | data_reg = mvbc->config_vreg; | ||
23 | |||
24 | /* Accessing device 31 crashes those Marvells. Since years. | ||
25 | Will they ever make sane controllers ... */ | ||
26 | if (PCI_SLOT(devfn) == 31) | ||
27 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
28 | |||
29 | address = (bus->number << 16) | (devfn << 8) | | ||
30 | (where & 0xfc) | 0x80000000; | ||
31 | |||
32 | /* start the configuration cycle */ | ||
33 | MV_WRITE(address_reg, address); | ||
34 | |||
35 | switch (size) { | ||
36 | case 1: | ||
37 | *val = MV_READ_8(data_reg + (where & 0x3)); | ||
38 | break; | ||
39 | |||
40 | case 2: | ||
41 | *val = MV_READ_16(data_reg + (where & 0x3)); | ||
42 | break; | ||
43 | |||
44 | case 4: | ||
45 | *val = MV_READ(data_reg); | ||
46 | break; | ||
47 | } | ||
48 | |||
49 | return PCIBIOS_SUCCESSFUL; | ||
50 | } | ||
51 | |||
52 | static int mv_write_config(struct pci_bus *bus, unsigned int devfn, | ||
53 | int where, int size, u32 val) | ||
54 | { | ||
55 | struct mv_pci_controller *mvbc = bus->sysdata; | ||
56 | unsigned long address_reg, data_reg; | ||
57 | u32 address; | ||
58 | |||
59 | address_reg = mvbc->config_addr; | ||
60 | data_reg = mvbc->config_vreg; | ||
61 | |||
62 | /* Accessing device 31 crashes those Marvells. Since years. | ||
63 | Will they ever make sane controllers ... */ | ||
64 | if (PCI_SLOT(devfn) == 31) | ||
65 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
66 | |||
67 | address = (bus->number << 16) | (devfn << 8) | | ||
68 | (where & 0xfc) | 0x80000000; | ||
69 | |||
70 | /* start the configuration cycle */ | ||
71 | MV_WRITE(address_reg, address); | ||
72 | |||
73 | switch (size) { | ||
74 | case 1: | ||
75 | MV_WRITE_8(data_reg + (where & 0x3), val); | ||
76 | break; | ||
77 | |||
78 | case 2: | ||
79 | MV_WRITE_16(data_reg + (where & 0x3), val); | ||
80 | break; | ||
81 | |||
82 | case 4: | ||
83 | MV_WRITE(data_reg, val); | ||
84 | break; | ||
85 | } | ||
86 | |||
87 | return PCIBIOS_SUCCESSFUL; | ||
88 | } | ||
89 | |||
90 | struct pci_ops mv_pci_ops = { | ||
91 | .read = mv_read_config, | ||
92 | .write = mv_write_config | ||
93 | }; | ||