From: Bjorn Helgaas Date: Mon, 1 Aug 2016 17:25:37 +0000 (-0500) Subject: Merge branch 'pci/host-tegra' into next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ea1f4e9d1daf87c08ec399669300ee5d1fb68e89;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 ; removal tested by Jon Hunter . --- ea1f4e9d1daf87c08ec399669300ee5d1fb68e89 diff --cc drivers/pci/host/pci-tegra.c index 584777e0ad79,7689f448ff92..6de0757b11e4 --- a/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; }