diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-03-26 19:12:38 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2008-03-26 12:33:41 -0700 |
| commit | c34002c102880bfac5b449b41e5313dcda186db8 (patch) | |
| tree | b868da85842d52df7f0ceeef243b7dae7671f645 /arch/arm/mach-iop33x | |
| parent | 97c46048ce73c27fd2734299f07a8c06c8156a2e (diff) | |
| download | linux-3.10-c34002c102880bfac5b449b41e5313dcda186db8.tar.gz linux-3.10-c34002c102880bfac5b449b41e5313dcda186db8.tar.bz2 linux-3.10-c34002c102880bfac5b449b41e5313dcda186db8.zip | |
iop: unconditionally initialize the ATU on platforms known to be 'hosts'
Platforms like iq80321 and iq80331 which may be host-bus-adapters
require 'iop3xx_init_atu=y' to be specified on the kernel command line.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/mach-iop33x')
| -rw-r--r-- | arch/arm/mach-iop33x/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-iop33x/iq80331.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-iop33x/iq80332.c | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-iop33x/Kconfig b/arch/arm/mach-iop33x/Kconfig index 45598e09689..9aa016bb18f 100644 --- a/arch/arm/mach-iop33x/Kconfig +++ b/arch/arm/mach-iop33x/Kconfig @@ -16,14 +16,6 @@ config MACH_IQ80332 Say Y here if you want to run your kernel on the Intel IQ80332 evaluation kit for the IOP332 chipset. -config IOP3XX_ATU - bool "Enable the PCI Controller" - default y - help - Say Y here if you want the IOP to initialize its PCI Controller. - Say N if the IOP is an add in card, the host system owns the PCI - bus in this case. - endmenu endif diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c index 433188ebff2..de39fd77857 100644 --- a/arch/arm/mach-iop33x/iq80331.c +++ b/arch/arm/mach-iop33x/iq80331.c @@ -89,7 +89,7 @@ static struct hw_pci iq80331_pci __initdata = { .swizzle = pci_std_swizzle, .nr_controllers = 1, .setup = iop3xx_pci_setup, - .preinit = iop3xx_pci_preinit, + .preinit = iop3xx_pci_preinit_cond, .scan = iop3xx_pci_scan_bus, .map_irq = iq80331_pci_map_irq, }; diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c index 416c09564cc..4904fd78445 100644 --- a/arch/arm/mach-iop33x/iq80332.c +++ b/arch/arm/mach-iop33x/iq80332.c @@ -89,7 +89,7 @@ static struct hw_pci iq80332_pci __initdata = { .swizzle = pci_std_swizzle, .nr_controllers = 1, .setup = iop3xx_pci_setup, - .preinit = iop3xx_pci_preinit, + .preinit = iop3xx_pci_preinit_cond, .scan = iop3xx_pci_scan_bus, .map_irq = iq80332_pci_map_irq, }; |