From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 1 Oct 2014 18:31:23 +0000 (-0600)
Subject: Merge branch 'pci/host-generic' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07a7cbd3b815ea77b44d4d5bb4260b37d03a358d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'pci/host-generic' into next

* 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
---

07a7cbd3b815ea77b44d4d5bb4260b37d03a358d
diff --cc drivers/pci/host/pci-tegra.c
index 79a30476036c,946935db62b6..3d43874319be
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@@ -657,16 -626,8 +657,19 @@@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI
  static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
  {
  	struct tegra_pcie *pcie = sys_to_pcie(sys);
 -	phys_addr_t io_start = pci_pio_to_address(pcie->io.start);
 +	int err;
++	phys_addr_t io_start;
 +
 +	err = devm_request_resource(pcie->dev, &pcie->all, &pcie->mem);
 +	if (err < 0)
 +		return err;
 +
 +	err = devm_request_resource(pcie->dev, &pcie->all, &pcie->prefetch);
 +	if (err)
 +		return err;
 +
++	io_start = pci_pio_to_address(pcie->io.start);
+ 
  	pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
  	pci_add_resource_offset(&sys->resources, &pcie->prefetch,
  				sys->mem_offset);