linux/arch/mips/pci
Linus Torvalds cebfa85eb8 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
 "The MIPS bits for 3.8.  This also includes a bunch fixes that were
  sitting in the linux-mips.org git tree for a long time.  This pull
  request contains updates to several OCTEON drivers and the board
  support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
  updates to the SSB bus support, MIPS kexec code and adds support for
  kdump.

  When pulling this, there are two expected merge conflicts in
  include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
  resolve, just remove the conflict markers and keep both alternatives."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
  MIPS: PMC-Sierra Yosemite: Remove support.
  VIDEO: Newport Fix console crashes
  MIPS: wrppmc: Fix build of PCI code.
  MIPS: IP22/IP28: Fix build of EISA code.
  MIPS: RB532: Fix build of prom code.
  MIPS: PowerTV: Fix build.
  MIPS: IP27: Correct fucked grammar in ops-bridge.c
  MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
  MIPS: Fix potencial corruption
  MIPS: Fix for warning from FPU emulation code
  MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
  MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
  MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
  MIPS: Remove unused smvp.h
  MIPS/EDAC: Improve OCTEON EDAC support.
  MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
  MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
  ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
  MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
  MIPS: Remove usage of CEVT_R4K_LIB config option.
  ...
2012-12-14 14:27:45 -08:00
..
fixup-bcm63xx.c MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs. 2009-09-17 20:07:52 +02:00
fixup-capcella.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-cobalt.c MIPS: PCI: Add missing __devinit attributions to fixup functions. 2012-07-23 13:55:55 +01:00
fixup-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
fixup-fuloong2e.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-ip32.c
fixup-jmr3927.c [MIPS] TXx9: Make single kernel can support multiple boards 2008-07-15 18:44:35 +01:00
fixup-lantiq.c MIPS: pci: convert lantiq driver to OF 2012-05-21 14:31:52 +01:00
fixup-lemote2f.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-malta.c MIPS: Malta: Fix section mismatch. 2012-10-11 11:14:12 +02:00
fixup-mpc30x.c mips: mark const init data with __initconst instead of __initdata 2012-07-19 11:23:43 +02:00
fixup-pmcmsp.c
fixup-pnx8550.c
fixup-rbtx4927.c [MIPS] TXx9: Make single kernel can support multiple boards 2008-07-15 18:44:35 +01:00
fixup-rbtx4938.c [MIPS] TXx9: Make single kernel can support multiple boards 2008-07-15 18:44:35 +01:00
fixup-rc32434.c MIPS: PCI: Add missing __devinit attributions to fixup functions. 2012-07-23 13:55:55 +01:00
fixup-sb1250.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
fixup-sni.c
fixup-tb0219.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-tb0226.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-tb0287.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
fixup-wrppmc.c
Makefile MIPS: PMC-Sierra Yosemite: Remove support. 2012-12-13 18:15:30 +01:00
msi-octeon.c MIPS: Fix up inconsistency in panic() string argument. 2011-12-07 22:01:45 +00:00
ops-bcm63xx.c Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next 2012-07-25 16:37:46 +02:00
ops-bonito64.c MIPS: Bonito64: Make Loongson independent from Bonito64 code. 2009-12-17 01:57:06 +00:00
ops-bridge.c MIPS: IP27: Correct fucked grammar in ops-bridge.c 2012-12-13 18:15:28 +01:00
ops-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
ops-gt64xxx_pci0.c
ops-lantiq.c MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
ops-loongson2.c MIPS: Include export.h in for EXPORT_SYMBOL in ops-loongson2.c 2012-05-15 17:47:01 +02:00
ops-mace.c [MIPS] Enable FAST-20 for onboard scsi 2008-07-15 18:44:31 +01:00
ops-msc.c
ops-nile4.c MIPS: NILE4: Remove useless inclusion of GT64120 header. 2011-07-20 23:12:09 +01:00
ops-pmcmsp.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-pnx8550.c MIPS: Kill unused <asm/debug.h> inclusions 2008-10-15 12:46:52 +01:00
ops-rc32434.c [MIPS] Routerboard 532: Support for base system 2008-07-20 14:38:18 +01:00
ops-sni.c
ops-tx3927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-tx4927.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
ops-vr41xx.c Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
pci-alchemy.c MIPS: Fix Jazz 64-bit build error. 2011-12-07 22:01:45 +00:00
pci-ar71xx.c MIPS: ath79: add support for the PCI host controller of the AR71XX SoCs 2012-05-15 17:49:05 +02:00
pci-ar724x.c MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module 2012-08-23 15:44:47 +02:00
pci-bcm47xx.c bcma: add PCIe host controller 2012-02-06 14:53:04 -05:00
pci-bcm63xx.c MIPS: BCM63XX: use the new reset helper 2012-11-09 11:37:18 +01:00
pci-bcm63xx.h MIPS: BCM63XX: Add PCIe Support for BCM6328 2012-07-24 16:33:13 +02:00
pci-bcm1480.c mips/PCI: replace pci_probe_only with pci_flags 2012-02-23 20:18:57 -07:00
pci-bcm1480ht.c MIPS: Remove useless zero initializations. 2009-09-17 20:07:51 +02:00
pci-emma2rh.c MIPS: Eleminate filenames from comments 2009-08-03 17:52:40 +01:00
pci-ip27.c MIPS: PCI: Move fixups from __init to __devinit. 2012-07-19 11:27:23 +02:00
pci-ip32.c
pci-lantiq.c mips: pci-lantiq: Fix check for valid gpio 2012-07-05 15:02:18 +02:00
pci-lantiq.h MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
pci-lasat.c [MIPS] Remove mips_machtype for LASAT machines 2008-07-15 18:44:39 +01:00
pci-octeon.c MIPS/EDAC: Improve OCTEON EDAC support. 2012-12-13 18:15:26 +01:00
pci-rc32434.c MIPS: RC32434: Fix PCI build error 2011-09-21 17:51:57 +02:00
pci-sb1250.c mips/PCI: replace pci_probe_only with pci_flags 2012-02-23 20:18:57 -07:00
pci-tx4927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-tx4938.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-tx4939.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
pci-vr41xx.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pci-vr41xx.h Update Yoichi Yuasa's e-mail address 2009-07-03 15:45:29 +01:00
pci-xlp.c MIPS: Netlogic: XLP PCIe controller support. 2012-07-24 17:28:54 +02:00
pci-xlr.c MIPS: PCI: Update XLR/XLS PCI for the new PIC code 2012-11-20 08:33:50 +01:00
pci.c mips/PCI: Remove CONFIG_HOTPLUG ifdefs 2012-11-28 12:50:22 -08:00
pcie-octeon.c MIPS: Octeon: Add support for OCTEON II PCIe 2011-12-08 12:32:57 +00:00