@@ -1557,7 +1557,7 @@ tegra210_pcie_pad_probe(struct tegra_xusb_padctl *padctl,
goto unregister;
}
- pcie->rst = devm_reset_control_get(&pad->dev, "phy");
+ pcie->rst = devm_reset_control_get_exclusive(&pad->dev, "phy");
if (IS_ERR(pcie->rst)) {
err = PTR_ERR(pcie->rst);
dev_err(&pad->dev, "failed to get PCIe pad reset: %d\n", err);
@@ -1721,7 +1721,7 @@ tegra210_sata_pad_probe(struct tegra_xusb_padctl *padctl,
goto out;
}
- sata->rst = devm_reset_control_get(&pad->dev, "phy");
+ sata->rst = devm_reset_control_get_exclusive(&pad->dev, "phy");
if (IS_ERR(sata->rst)) {
err = PTR_ERR(sata->rst);
dev_err(&pad->dev, "failed to get SATA pad reset: %d\n", err);
@@ -881,7 +881,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
goto remove;
}
- padctl->rst = devm_reset_control_get(&pdev->dev, NULL);
+ padctl->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL);
if (IS_ERR(padctl->rst)) {
err = PTR_ERR(padctl->rst);
goto remove;
Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting reset lines") started to transition the reset control request API calls to explicitly state whether the driver needs exclusive or shared reset control behavior. Convert all drivers requesting exclusive resets to the explicit API call so the temporary transition helpers can be removed. No functional changes. Cc: Kishon Vijay Abraham I <kishon@ti.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-tegra@vger.kernel.org Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/phy/tegra/xusb-tegra210.c | 4 ++-- drivers/phy/tegra/xusb.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)