Merge branch 'pci/host-generic' into next

Browse source

* pci/host-generic:
  arm64: Add architectural support for PCI
  PCI: Add pci_remap_iospace() to map bus I/O resources
  of/pci: Add support for parsing PCI host bridge resources from DT
  of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()
  PCI: Add generic domain handling
  of/pci: Fix the conversion of IO ranges into IO resources
  of/pci: Move of_pci_range_to_resource() to of/address.c
  ARM: Define PCI_IOBASE as the base of virtual PCI IO space
  of/pci: Add pci_register_io_range() and pci_pio_to_address()
  asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP

Conflicts:
	drivers/pci/host/pci-tegra.c

...

This commit is contained in:

Bjorn Helgaas 2014-10-01 12:31:23 -06:00

parent cc0cb67adb d1e6dc91b5

commit 07a7cbd3b8

20 changed files with 576 additions and 37 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/asm-generic/io.h

View file

4

include/asm-generic/pgtable.h

View file

27

include/linux/of_address.h

View file

13

include/linux/of_pci.h

View file

27

include/linux/pci.h

View file