diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:08 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:08 -0500 |
| commit | 08d20f9f1e11a64979768d69af7871df2e43f794 (patch) | |
| tree | 568c21d574c33a3842e9791bb778d58a30772284 /drivers/pci | |
| parent | f90742cbfb51901307c30a3e99df314da79f73a5 (diff) | |
| parent | 4b9cc2c5fdca3e9211eef01d85f5e77bfe31533a (diff) | |
| download | linux-08d20f9f1e11a64979768d69af7871df2e43f794.tar.bz2 | |
Merge branch 'pci/host-tegra' into next
* pci/host-tegra:
PCI: tegra: Explicitly request exclusive reset control
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-tegra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index b3722b7709df..a64bd0a19176 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -1147,15 +1147,15 @@ static int tegra_pcie_resets_get(struct tegra_pcie *pcie) { struct device *dev = pcie->dev; - pcie->pex_rst = devm_reset_control_get(dev, "pex"); + pcie->pex_rst = devm_reset_control_get_exclusive(dev, "pex"); if (IS_ERR(pcie->pex_rst)) return PTR_ERR(pcie->pex_rst); - pcie->afi_rst = devm_reset_control_get(dev, "afi"); + pcie->afi_rst = devm_reset_control_get_exclusive(dev, "afi"); if (IS_ERR(pcie->afi_rst)) return PTR_ERR(pcie->afi_rst); - pcie->pcie_xrst = devm_reset_control_get(dev, "pcie_x"); + pcie->pcie_xrst = devm_reset_control_get_exclusive(dev, "pcie_x"); if (IS_ERR(pcie->pcie_xrst)) return PTR_ERR(pcie->pcie_xrst); |