diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 16:33:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 16:33:01 -0700 |
commit | 7f45e5cd1718ed769295033ca214032848a0097d (patch) | |
tree | bc4d2d43ea939c6c6b3782bf7d77537446eea225 /arch/sparc/include/asm/leon_pci.h | |
parent | 6aecceccf5aa626b0af203e54ca62cbf308c53d8 (diff) | |
parent | 10f0d07c51516bd24b040016c6d4304eef05f115 (diff) | |
download | blackbird-obmc-linux-7f45e5cd1718ed769295033ca214032848a0097d.tar.gz blackbird-obmc-linux-7f45e5cd1718ed769295033ca214032848a0097d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc32, leon: bugfix in LEON SMP interrupt init
sparc32, sun4m: bugfix in SMP IPI traphandler
sparc: Remove unnecessary semicolons
Add support for allocating irqs for bootbus devices
Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly
Restructure sun4d_build_device_irq so that timer interrupts can be allocated
sparc: PCIC_PCI needs SPARC32 dependency
sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED
sparc32,leon: add GRPCI2 PCI Host driver
sparc32,leon: added LEON-common low-level PCI routines
sparc32: added CONFIG_PCIC_PCI Kconfig setting
Diffstat (limited to 'arch/sparc/include/asm/leon_pci.h')
-rw-r--r-- | arch/sparc/include/asm/leon_pci.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/leon_pci.h b/arch/sparc/include/asm/leon_pci.h new file mode 100644 index 000000000000..42b4b31a82fe --- /dev/null +++ b/arch/sparc/include/asm/leon_pci.h @@ -0,0 +1,21 @@ +/* + * asm/leon_pci.h + * + * Copyright (C) 2011 Aeroflex Gaisler AB, Daniel Hellstrom + */ + +#ifndef _ASM_LEON_PCI_H_ +#define _ASM_LEON_PCI_H_ + +/* PCI related definitions */ +struct leon_pci_info { + struct pci_ops *ops; + struct resource io_space; + struct resource mem_space; + int (*map_irq)(struct pci_dev *dev, u8 slot, u8 pin); +}; + +extern void leon_pci_init(struct platform_device *ofdev, + struct leon_pci_info *info); + +#endif /* _ASM_LEON_PCI_H_ */ |