Linus Torvalds
475c77edf8
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci ...
Pull PCI changes (including maintainer change) from Jesse Barnes:
"This pull has some good cleanups from Bjorn and Yinghai, as well as
some more code from Yinghai to better handle resource re-allocation
when enabled.
There's also a new initcall_debug feature from Arjan which will print
out quirk timing information to help identify slow quirks for fixing
or refinement (Yinghai sent in a few patches to do just that once the
new debug code landed).
Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
He's been a core PCI and Linux contributor for some time now, and has
kindly volunteered to take over. I just don't feel I have the time
for PCI review and work that it deserves lately (I've taken on some
other projects), and haven't been as responsive lately as I'd like, so
I approached Bjorn asking if he'd like to manage things. He's going
to give it a try, and I'm confident he'll do at least as well as I
have in keeping the tree managed, patches flowing, and keeping things
stable."
Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
PCI: Bjorn gets PCI hotplug too
PCI: hand PCI maintenance over to Bjorn Helgaas
unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
sparc/PCI: convert devtree and arch-probed bus addresses to resource
powerpc/PCI: allow reallocation on PA Semi
powerpc/PCI: convert devtree bus addresses to resource
powerpc/PCI: compute I/O space bus-to-resource offset consistently
arm/PCI: don't export pci_flags
PCI: fix bridge I/O window bus-to-resource conversion
x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
PCI / PCIe: Introduce command line option to disable ARI
PCI: make acpihp use __pci_remove_bus_device instead
PCI: export __pci_remove_bus_device
PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
PCI: print out PCI device info along with duration
PCI: Move "pci reassigndev resource alignment" out of quirks.c
PCI: Use class for quirk for usb host controller fixup
PCI: Use class for quirk for ti816x class fixup
PCI: Use class for quirk for intel e100 interrupt fixup
...
2012-03-23 14:02:12 -07:00
Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
2011-12-12 15:19:53 -08:00
MIPS: Alchemy: Au1300 SoC support
2011-12-07 22:02:05 +00:00
USB: EHCI: Support controllers with big endian capability regs
2011-05-03 11:43:21 -07:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
usb: Fix typo in ehci-dbg.c
2012-02-24 13:12:16 -08:00
Merge 3.3-rc7 into usb-next
2012-03-12 09:13:31 -07:00
Revert "powerpc/usb: fix issue of CPU halt when missing USB PHY clock"
2012-03-02 16:08:54 -08:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
USB: use generic platform driver on ath79
2012-03-15 12:45:43 -07:00
Here we have a big rework done by Heikki Krogerus (thanks) which
2012-03-01 08:45:33 -08:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
USB: Mark EHCI LPM functions as __maybe_unused
2011-02-17 10:47:55 -08:00
USB: Add EHCI bus glue for Loongson1x SoCs (UPDATED)
2012-01-24 15:28:02 -08:00
USB: EHCI: AMD periodic frame list table quirk
2010-11-16 13:36:40 -08:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
Driver specific changes
2012-01-09 14:39:22 -08:00
ARM: Orion: Get address map from plat-orion instead of via platform_data
2011-12-13 18:46:55 -05:00
usb: add support for STA2X11 host driver
2012-01-24 14:15:37 -08:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
usb: PS3 EHCI HC reset work-around
2011-12-08 09:38:53 -08:00
usb: fix number of mapped SG DMA entries
2011-12-09 16:18:19 -08:00
USB: ehci-s5p: add DMA burst support
2012-03-08 13:05:47 -08:00
EHCI : Fix a regression in the ISO scheduler
2011-11-29 09:59:29 +09:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: ehci-spear: Add PM support
2012-02-24 13:40:04 -08:00
USB: EHCI: Allow users to override 80% max periodic bandwidth
2011-07-08 14:51:33 -07:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
usb: Remove ehci_reset call from ehci_run
2011-12-08 09:38:53 -08:00
USB: EHCI: Don't use NO_IRQ in xilinx ehci driver
2012-01-16 08:23:15 +01:00
Merge 3.2-rc3 into usb-linus
2011-11-26 19:46:48 -08:00
usb: otg: Rename otg_transceiver to usb_phy
2012-02-13 13:34:36 +02:00
USB: make hcd.h public (drivers dependency)
2010-05-20 13:21:30 -07:00
usb: convert drivers/usb/* to use module_platform_driver()
2011-11-28 06:48:32 +09:00
USB: make hcd.h public (drivers dependency)
2010-05-20 13:21:30 -07:00
USB: make hcd.h public (drivers dependency)
2010-05-20 13:21:30 -07:00
USB: make hcd.h public (drivers dependency)
2010-05-20 13:21:30 -07:00
QE/FHCI: fixed the CONTROL bug
2011-10-18 13:51:34 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
usb: Fix build error due to dma_mask is not at pdev_archdata at ARM
2012-02-24 13:37:44 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
usb: Fix typo in imx21-dbg.c
2012-02-13 14:32:34 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
USB: imx21-hcd accept arbitary transfer buffer alignement.
2010-10-22 10:22:03 -07:00
usb: isp116x-hcd: Convert to module_platform_driver
2012-03-02 16:20:28 -08:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
usb: isp1362-hcd: Convert to module_platform_driver
2012-02-24 13:12:16 -08:00
USB: host: Remove dead CONFIG_ARCH_KARO
2010-08-10 14:35:40 -07:00
usb/isp1760: Fix race condition memory leak
2011-11-26 20:02:47 -08:00
usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
2011-10-19 13:29:06 -07:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
USB: use generic platform driver on ath79
2012-03-15 12:45:43 -07:00
usb: host: xhci: add platform driver support
2012-03-13 10:30:59 -07:00
usb: Configure octeon2 glue logic for proper uSOF cycle period.
2011-05-03 10:09:32 -07:00
ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
2012-01-20 15:51:14 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: OHCI: fix new compiler warnings
2012-01-24 12:24:06 -08:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ohci-exynos: replace hcd->state with ohci->rh_state
2012-02-24 13:40:04 -08:00
USB: use generic platform driver on ath79
2012-03-15 12:45:43 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
2010-11-11 07:14:07 -08:00
USB: ohci-nxp: Remove i2c_write(), use smbus
2012-03-13 14:27:28 -07:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
usb: otg: Convert all users to pass struct usb_otg for OTG functions
2012-02-27 15:41:52 +02:00
ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs
2011-12-16 04:29:57 -07:00
usb: add support for STA2X11 host driver
2012-01-24 14:15:37 -08:00
USB: OHCI: Add a generic platform device driver
2012-03-15 12:41:58 -07:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
2012-03-15 13:46:54 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: ohci-s3c2410: add PM support
2011-11-30 20:08:26 +09:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
USB: irq: Remove IRQF_DISABLED
2011-09-18 01:39:36 -07:00
OHCI: remove uses of hcd->state
2011-11-18 10:51:00 -08:00
usb: OHCI/EHCI-XLS: Use resource_size v3
2011-11-15 10:21:56 -08:00
usb: otg: Rename otg_transceiver to usb_phy
2012-02-13 13:34:36 +02:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
USB: replace uses of __constant_{endian}
2009-03-24 16:20:33 -07:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-03-23 14:02:12 -07:00
Intel xhci: Support EHCI/xHCI port switching.
2011-05-27 12:07:36 -07:00
usb: r8a66597-hcd: Convert to module_platform_driver
2012-03-02 16:20:29 -08:00
usb: r8a66597-hcd: add function for external controller
2011-07-08 14:57:11 -07:00
usb: sl811-hcd: Convert to module_platform_driver
2012-03-02 16:20:29 -08:00
pcmcia: Convert pcmcia_device_id declarations to const
2011-05-06 07:46:22 +02:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
USB: UHCI: Add support for big endian descriptors
2011-05-19 16:43:20 -07:00
treewide: Convert uses of struct resource to resource_size(ptr)
2011-06-10 14:55:36 +02:00
usb/uhci: initialize sg_table properly
2012-01-24 14:30:23 -08:00
USB: UHCI: Add support for big endian descriptors
2011-05-19 16:43:20 -07:00
USB: UHCI: Wrap I/O register accesses
2011-05-06 18:24:01 -07:00
USB: UHCI: Move PCI specific functions to uhci-pci.c
2011-05-06 18:24:00 -07:00
usb: fix number of mapped SG DMA entries
2011-12-09 16:18:19 -08:00
Merge 3.0-rc2 into usb-linus as it's needed by some USB patches
2011-06-14 06:51:23 -07:00
xHCI: Check host USB2 LPM capability
2011-09-26 15:51:09 -07:00
USB/xHCI: Enable USB 3.0 hub remote wakeup.
2012-02-14 12:12:24 -08:00
xHCI: Allocate 2 segments for transfer ring
2012-03-13 09:30:34 -07:00
Revert "xHCI: reset-on-resume quirk for NEC uPD720200"
2011-12-01 10:41:40 -08:00
usb: host: xhci: add platform driver support
2012-03-13 10:30:59 -07:00
xHCI: check enqueue pointer advance into dequeue seg
2012-03-13 09:30:44 -07:00
usb: host: xhci: add platform driver support
2012-03-13 10:30:59 -07:00
usb: host: xhci: add platform driver support
2012-03-13 10:30:59 -07:00
475c77edf8