Commit 08d20f9f authored by Bjorn Helgaas's avatar Bjorn Helgaas

Merge branch 'pci/host-tegra' into next

* pci/host-tegra:
  PCI: tegra: Explicitly request exclusive reset control
parents f90742cb 4b9cc2c5
...@@ -1147,15 +1147,15 @@ static int tegra_pcie_resets_get(struct tegra_pcie *pcie) ...@@ -1147,15 +1147,15 @@ static int tegra_pcie_resets_get(struct tegra_pcie *pcie)
{ {
struct device *dev = pcie->dev; 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)) if (IS_ERR(pcie->pex_rst))
return PTR_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)) if (IS_ERR(pcie->afi_rst))
return PTR_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)) if (IS_ERR(pcie->pcie_xrst))
return PTR_ERR(pcie->pcie_xrst); return PTR_ERR(pcie->pcie_xrst);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment