]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'pci/host-tegra' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Aug 2016 17:25:37 +0000 (12:25 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 1 Aug 2016 17:25:37 +0000 (12:25 -0500)
commitea1f4e9d1daf87c08ec399669300ee5d1fb68e89
treec4eeb0293b9933b588b4672c1fcc1d770b88ae24
parent79dd99346166bcbf3b082f6e234db788da1db3c9
parentf814430c3ec89177f5d530484c4df95c268aedfb
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>.
drivers/pci/host/pci-tegra.c