summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/freescale/pinctrl-imx.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-08-01 19:25:37 +0200
committerBjorn Helgaas <bhelgaas@google.com>2016-08-01 19:25:37 +0200
commitea1f4e9d1daf87c08ec399669300ee5d1fb68e89 (patch)
treec4eeb0293b9933b588b4672c1fcc1d770b88ae24 /drivers/pinctrl/freescale/pinctrl-imx.c
parentMerge branches 'pci/demodularize-hosts' and 'pci/host-request-windows' into next (diff)
parentPCI: tegra: Program PADS_REFCLK_CFG* registers with per-SoC values (diff)
downloadlinux-ea1f4e9d1daf87c08ec399669300ee5d1fb68e89.tar.xz
linux-ea1f4e9d1daf87c08ec399669300ee5d1fb68e89.zip
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>.
Diffstat (limited to 'drivers/pinctrl/freescale/pinctrl-imx.c')
0 files changed, 0 insertions, 0 deletions