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

Merge branch 'pci/host-tegra' into next 

* pci/host-tegra:
  PCI: tegra: Explicitly request exclusive reset control
parents f90742cb 4b9cc2c5

drivers/pci/host/pci-tegra.c

+3 −3
Original line number Diff line number Diff line
@@ -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);