0b33162ec5
This is a series from Arnd that fixes a number of compiler warnings when building defconfigs on ARM. * late/fixes: ARM: footbridge: nw_gpio_lock is raw_spin_lock ARM: mv78xx0: correct addr_map_cfg __initdata annotation ARM: footbridge: remove RTC_IRQ definition ARM: soc: dependency warnings for errata ARM: ks8695: __arch_virt_to_dma type handling ARM: rpc: check device_register return code in ecard_probe ARM: davinci: don't mark da850_register_cpufreq as __init ARM: iop13xx: fix iq81340sc_atux_map_irq prototype ARM: iop13xx: mark iop13xx_scan_bus as __devinit ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok ARM: s3c24xx: fix multiple section mismatch warnings ARM: at91: unused variable in at91_pm_verify_clocks ARM: at91: skip at91_io_desc definition for NOMMU ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM ARM: pxa: remove sharpsl_fatal_check function ARM: pxa: define palmte2_pxa_keys conditionally ARM: pxa: Wunused-result warning in viper board file ARM: shark: fix shark_pci_init return code Fixed trivial conflicts in arch/arm/mach-at91/setup.c. Signed-off-by: Olof Johansson <olof@lixom.net>
57 lines
1 KiB
C
57 lines
1 KiB
C
/*
|
|
* linux/arch/arm/mach-shark/pci.c
|
|
*
|
|
* PCI bios-type initialisation for PCI machines
|
|
*
|
|
* Bits taken from various places.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <video/vga.h>
|
|
|
|
#include <asm/irq.h>
|
|
#include <asm/mach/pci.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#define IO_START 0x40000000
|
|
|
|
static int __init shark_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
if (dev->bus->number == 0)
|
|
if (dev->devfn == 0)
|
|
return 255;
|
|
else
|
|
return 11;
|
|
else
|
|
return 255;
|
|
}
|
|
|
|
extern void __init via82c505_preinit(void);
|
|
|
|
static struct hw_pci shark_pci __initdata = {
|
|
.setup = via82c505_setup,
|
|
.map_irq = shark_map_irq,
|
|
.nr_controllers = 1,
|
|
.ops = &via82c505_ops,
|
|
.preinit = via82c505_preinit,
|
|
};
|
|
|
|
static int __init shark_pci_init(void)
|
|
{
|
|
if (!machine_is_shark())
|
|
return -ENODEV;
|
|
|
|
pcibios_min_io = 0x6000;
|
|
pcibios_min_mem = 0x50000000;
|
|
vga_base = 0xe8000000;
|
|
|
|
pci_ioremap_io(0, IO_START);
|
|
|
|
pci_common_init(&shark_pci);
|
|
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(shark_pci_init);
|