Merge branch 'pci/host-tegra' into next

* pci/host-tegra:
  PCI: tegra: Program PADS_REFCLK_CFG* registers with per-SoC values
  PCI: tegra: Program PADS_REFCLK_CFG* always, not just on legacy SoCs
  PCI: tegra: Stop setting pcibios_min_mem
  PCI: tegra: Use generic pci_remap_iospace() rather than ARM32-specific one
  PCI: tegra: Use lower-case hex consistently for register definitions

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

Drop stray pci_ioremap_io() per Thierry Reding <treding@nvidia.com>;
removal tested by Jon Hunter <jonathanh@nvidia.com>.

diff --cc drivers/pci/host/pci-tegra.c
index 584777e0ad79e8b337ade4ee5af9407ce7775794,7689f448ff924e02ab38521b26709e7e084d9e82..6de0757b11e4641b2a79b05fd62d19083656419e
--- 1/drivers/pci/host/pci-tegra.c
--- 2/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@@ -628,18 -624,22 +621,17 @@@ static int tegra_pcie_setup(int nr, str
        if (err < 0)
                return err;
  
-       pci_ioremap_io(pcie->pio.start, pcie->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;
--
        pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
        pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
        pci_add_resource_offset(&sys->resources, &pcie->prefetch,
                                sys->mem_offset);
        pci_add_resource(&sys->resources, &pcie->busn);
  
 -      pci_remap_iospace(&pcie->pio, pcie->io.start);
 +      err = devm_request_pci_bus_resources(pcie->dev, &sys->resources);
 +      if (err < 0)
 +              return err;
  
++      pci_remap_iospace(&pcie->pio, pcie->io.start);
        return 1;
  }