1
linux/arch/mips/pci
Linus Torvalds aebb2afd54 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:

 o Add basic support for the Mediatek/Ralink Wireless SoC family.

 o The Qualcomm Atheros platform is extended by support for the new
   QCA955X SoC series as well as a bunch of patches that get the code
   ready for OF support.

 o Lantiq and BCM47XX platform have a few improvements and bug fixes.

 o MIPS has sent a few patches that get the kernel ready for the
   upcoming microMIPS support.

 o The rest of the series is made up of small bug fixes and cleanups
   that relate to various parts of the MIPS code.  The biggy in there is
   a whitespace cleanup.  After I was sent another set of whitespace
   cleanup patches I decided it was the time to clean the whitespace
   "issues" for once and and that touches many files below arch/mips/.

Fix up silly conflicts, mostly due to whitespace cleanups.

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
  MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
  MIPS: remove broken conditional inside vpe loader code
  MIPS: SMTC: fix implicit declaration of set_vi_handler
  MIPS: early_printk: drop __init annotations
  MIPS: Probe for and report hardware virtualization support.
  MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
  MIPS: ath79: add USB controller registration code for the QCA955X SoCs
  MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
  MIPS: ath79: add WMAC registration code for the QCA955X SoCs
  MIPS: ath79: register UART for the QCA955X SoCs
  MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
  MIPS: ath79: add GPIO setup code for the QCA955X SoCs
  MIPS: ath79: add IRQ handling code for the QCA955X SoCs
  MIPS: ath79: add clock setup code for the QCA955X SoCs
  MIPS: ath79: add SoC detection code for the QCA955X SoCs
  MIPS: ath79: add early printk support for the QCA955X SoCs
  MIPS: ath79: fix WMAC IRQ resource assignment
  mips: reserve elfcorehdr
  mips: Make sure kernel memory is in iomem
  MIPS: ath79: use dynamically allocated USB platform devices
  ...
2013-03-02 07:44:16 -08:00
..
fixup-bcm63xx.c
fixup-capcella.c
fixup-cobalt.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-emma2rh.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-fuloong2e.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-ip32.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-jmr3927.c
fixup-lantiq.c MIPS: pci: convert lantiq driver to OF 2012-05-21 14:31:52 +01:00
fixup-lemote2f.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-malta.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01: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 MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-rbtx4927.c
fixup-rbtx4938.c
fixup-rc32434.c MIPS: drivers: remove __dev* attributes. 2013-01-03 15:57:09 -08:00
fixup-sb1250.c MIPS: drivers: remove __dev* attributes. 2013-01-03 15:57:09 -08:00
fixup-sni.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-tb0219.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-tb0226.c
fixup-tb0287.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
fixup-wrppmc.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
Makefile MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
msi-octeon.c MIPS: Fix up inconsistency in panic() string argument. 2011-12-07 22:01:45 +00:00
ops-bcm63xx.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-bonito64.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-bridge.c MIPS: IP27: Correct fucked grammar in ops-bridge.c 2012-12-13 18:15:28 +01:00
ops-emma2rh.c
ops-gt64xxx_pci0.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-lantiq.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-loongson2.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-mace.c
ops-msc.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-nile4.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-pmcmsp.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-rc32434.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-sni.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-tx3927.c MIPS: irq: Remove IRQF_DISABLED 2011-12-07 22:03:45 +00:00
ops-tx4927.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
ops-vr41xx.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-alchemy.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-ar71xx.c MIPS: pci-ar71xx: move irq base to the controller structure 2013-02-17 01:25:41 +01:00
pci-ar724x.c MIPS: pci-ar724x: setup command register of the PCI controller 2013-02-17 01:25:39 +01:00
pci-bcm47xx.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-bcm63xx.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-bcm63xx.h MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-bcm1480.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-bcm1480ht.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-emma2rh.c
pci-ip27.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-ip32.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-lantiq.c Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2013-03-02 07:44:16 -08:00
pci-lantiq.h MIPS: Lantiq: Add PCI controller support. 2011-05-19 09:55:42 +01:00
pci-lasat.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-octeon.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-rc32434.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-sb1250.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01: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 MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-vr41xx.h MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci-xlp.c Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next 2013-02-21 12:51:33 +01:00
pci-xlr.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00
pci.c Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next 2013-02-21 12:51:33 +01:00
pcie-octeon.c MIPS: Whitespace cleanup. 2013-02-01 10:00:22 +01:00