diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2007-05-02 17:59:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-03 14:02:48 +0100 |
| commit | e90ddd813df7897af34226ed1cd442f7a182816e (patch) | |
| tree | 1ecf08c0aa9d71d54019fc84876a07898352b641 /arch/arm/mach-iop33x/iq80331.c | |
| parent | fa543f005de175080640266ca536d45b4b0b1a61 (diff) | |
| download | blackbird-obmc-linux-e90ddd813df7897af34226ed1cd442f7a182816e.tar.gz blackbird-obmc-linux-e90ddd813df7897af34226ed1cd442f7a182816e.zip | |
[ARM] 4348/4: iop3xx: Give Linux control over PCI initialization
Currently the iop3xx platform support code assumes that RedBoot is the
bootloader and has already initialized the ATU. Linux should handle this
initialization for three reasons:
1/ The memory map that RedBoot sets up is not optimal (page_to_dma and
virt_to_phys return different addresses). The effect of this is that using
the dma mapping API for the internal bus dma units generates pci bus
addresses that are incorrect for the internal bus.
2/ Not all iop platforms use RedBoot
3/ If the ATU is already initialized it indicates that the iop is an add-in
card in another host, it does not own the PCI bus, and should not be
re-initialized.
Changelog:
* rather than change nr_controllers to zero, simply do not call
pci_common_init
Cc: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop33x/iq80331.c')
| -rw-r--r-- | arch/arm/mach-iop33x/iq80331.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index 1a9e36138d80..376c932830be 100644 --- a/arch/arm/mach-iop33x/iq80331.c +++ b/arch/arm/mach-iop33x/iq80331.c @@ -96,7 +96,8 @@ static struct hw_pci iq80331_pci __initdata = { static int __init iq80331_pci_init(void) { - if (machine_is_iq80331()) + if ((iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) && + machine_is_iq80331()) pci_common_init(&iq80331_pci); return 0; |
