4e57b68178
I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
121 lines
2.7 KiB
C
121 lines
2.7 KiB
C
/*
|
|
* arch/arm/mach-iop3xx/iq80331-pci.c
|
|
*
|
|
* PCI support for the Intel IQ80331 reference board
|
|
*
|
|
* Author: Dave Jiang <dave.jiang@intel.com>
|
|
* Copyright (C) 2003, 2004 Intel Corp.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/init.h>
|
|
#include <linux/string.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/hardware.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/mach/pci.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
/*
|
|
* The following macro is used to lookup irqs in a standard table
|
|
* format for those systems that do not already have PCI
|
|
* interrupts properly routed. We assume 1 <= pin <= 4
|
|
*/
|
|
#define PCI_IRQ_TABLE_LOOKUP(minid,maxid) \
|
|
({ int _ctl_ = -1; \
|
|
unsigned int _idsel = idsel - minid; \
|
|
if (_idsel <= maxid) \
|
|
_ctl_ = pci_irq_table[_idsel][pin-1]; \
|
|
_ctl_; })
|
|
|
|
#define INTA IRQ_IQ80331_INTA
|
|
#define INTB IRQ_IQ80331_INTB
|
|
#define INTC IRQ_IQ80331_INTC
|
|
#define INTD IRQ_IQ80331_INTD
|
|
|
|
//#define INTE IRQ_IQ80331_I82544
|
|
|
|
static inline int __init
|
|
iq80331_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
|
|
{
|
|
static int pci_irq_table[][4] = {
|
|
/*
|
|
* PCI IDSEL/INTPIN->INTLINE
|
|
* A B C D
|
|
*/
|
|
{INTB, INTC, INTD, INTA}, /* PCI-X Slot */
|
|
{INTC, INTC, INTC, INTC}, /* GigE */
|
|
};
|
|
|
|
BUG_ON(pin < 1 || pin > 4);
|
|
|
|
return PCI_IRQ_TABLE_LOOKUP(1, 7);
|
|
}
|
|
|
|
static int iq80331_setup(int nr, struct pci_sys_data *sys)
|
|
{
|
|
struct resource *res;
|
|
|
|
if(nr != 0)
|
|
return 0;
|
|
|
|
res = kmalloc(sizeof(struct resource) * 2, GFP_KERNEL);
|
|
if (!res)
|
|
panic("PCI: unable to alloc resources");
|
|
|
|
memset(res, 0, sizeof(struct resource) * 2);
|
|
|
|
res[0].start = IOP331_PCI_LOWER_IO_VA;
|
|
res[0].end = IOP331_PCI_UPPER_IO_VA;
|
|
res[0].name = "IQ80331 PCI I/O Space";
|
|
res[0].flags = IORESOURCE_IO;
|
|
|
|
res[1].start = IOP331_PCI_LOWER_MEM_PA;
|
|
res[1].end = IOP331_PCI_UPPER_MEM_PA;
|
|
res[1].name = "IQ80331 PCI Memory Space";
|
|
res[1].flags = IORESOURCE_MEM;
|
|
|
|
request_resource(&ioport_resource, &res[0]);
|
|
request_resource(&iomem_resource, &res[1]);
|
|
|
|
sys->mem_offset = IOP331_PCI_MEM_OFFSET;
|
|
sys->io_offset = IOP331_PCI_IO_OFFSET;
|
|
|
|
sys->resource[0] = &res[0];
|
|
sys->resource[1] = &res[1];
|
|
sys->resource[2] = NULL;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void iq80331_preinit(void)
|
|
{
|
|
iop331_init();
|
|
}
|
|
|
|
static struct hw_pci iq80331_pci __initdata = {
|
|
.swizzle = pci_std_swizzle,
|
|
.nr_controllers = 1,
|
|
.setup = iq80331_setup,
|
|
.scan = iop331_scan_bus,
|
|
.preinit = iq80331_preinit,
|
|
.map_irq = iq80331_map_irq
|
|
};
|
|
|
|
static int __init iq80331_pci_init(void)
|
|
{
|
|
if (machine_is_iq80331())
|
|
pci_common_init(&iq80331_pci);
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(iq80331_pci_init);
|
|
|
|
|
|
|
|
|