diff options
author | Matt Porter <mporter@kernel.crashing.org> | 2005-11-07 03:58:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:27 -0500 |
commit | 7869ec6d735e3802f0d442f585ae6bb7633222f6 (patch) | |
tree | 94860fe4b69524dffcba80c01ecd9f3dc543784c /arch/ppc | |
parent | 3e9e7c1d0b7a36fb8affb973a054c5098e27baa8 (diff) |
[PATCH] ppc32: Remove internal PCI arbiter check on PPC40x
On PPC405GP/GPR it should be possible to enable PCI support, even when the
internal PCI arbiter is disabled (e.g. when using an external PCI
arbiter). The removed code didn't allow this, and also generated a warning
on PPC405EP platforms.
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/syslib/ppc405_pci.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/ppc/syslib/ppc405_pci.c b/arch/ppc/syslib/ppc405_pci.c index 81c83bf98df4..d6d838b16dac 100644 --- a/arch/ppc/syslib/ppc405_pci.c +++ b/arch/ppc/syslib/ppc405_pci.c | |||
@@ -89,13 +89,6 @@ ppc4xx_find_bridges(void) | |||
89 | isa_mem_base = 0; | 89 | isa_mem_base = 0; |
90 | pci_dram_offset = 0; | 90 | pci_dram_offset = 0; |
91 | 91 | ||
92 | #if (PSR_PCI_ARBIT_EN > 1) | ||
93 | /* Check if running in slave mode */ | ||
94 | if ((mfdcr(DCRN_CHPSR) & PSR_PCI_ARBIT_EN) == 0) { | ||
95 | printk("Running as PCI slave, kernel PCI disabled !\n"); | ||
96 | return; | ||
97 | } | ||
98 | #endif | ||
99 | /* Setup PCI32 hose */ | 92 | /* Setup PCI32 hose */ |
100 | hose_a = pcibios_alloc_controller(); | 93 | hose_a = pcibios_alloc_controller(); |
101 | if (!hose_a) | 94 | if (!hose_a) |