@@ -2011,7 +2011,7 @@ static int tegra_dc_probe(struct platform_device *pdev)
return PTR_ERR(dc->clk);
}
- dc->rst = devm_reset_control_get(&pdev->dev, "dc");
+ dc->rst = devm_reset_control_get_exclusive(&pdev->dev, "dc");
if (IS_ERR(dc->rst)) {
dev_err(&pdev->dev, "failed to get reset\n");
return PTR_ERR(dc->rst);
@@ -445,7 +445,8 @@ static int tegra_dpaux_probe(struct platform_device *pdev)
}
if (!pdev->dev.pm_domain) {
- dpaux->rst = devm_reset_control_get(&pdev->dev, "dpaux");
+ dpaux->rst = devm_reset_control_get_exclusive(&pdev->dev,
+ "dpaux");
if (IS_ERR(dpaux->rst)) {
dev_err(&pdev->dev,
"failed to get reset control: %ld\n",
@@ -1518,7 +1518,7 @@ static int tegra_dsi_probe(struct platform_device *pdev)
dsi->lanes = 4;
if (!pdev->dev.pm_domain) {
- dsi->rst = devm_reset_control_get(&pdev->dev, "dsi");
+ dsi->rst = devm_reset_control_get_exclusive(&pdev->dev, "dsi");
if (IS_ERR(dsi->rst))
return PTR_ERR(dsi->rst);
}
@@ -260,7 +260,7 @@ static int gr3d_probe(struct platform_device *pdev)
return PTR_ERR(gr3d->clk);
}
- gr3d->rst = devm_reset_control_get(&pdev->dev, "3d");
+ gr3d->rst = devm_reset_control_get_exclusive(&pdev->dev, "3d");
if (IS_ERR(gr3d->rst)) {
dev_err(&pdev->dev, "cannot get reset\n");
return PTR_ERR(gr3d->rst);
@@ -273,8 +273,8 @@ static int gr3d_probe(struct platform_device *pdev)
return PTR_ERR(gr3d->clk_secondary);
}
- gr3d->rst_secondary = devm_reset_control_get(&pdev->dev,
- "3d2");
+ gr3d->rst_secondary = devm_reset_control_get_exclusive(&pdev->dev,
+ "3d2");
if (IS_ERR(gr3d->rst_secondary)) {
dev_err(&pdev->dev, "cannot get secondary reset\n");
return PTR_ERR(gr3d->rst_secondary);
@@ -1686,7 +1686,7 @@ static int tegra_hdmi_probe(struct platform_device *pdev)
return PTR_ERR(hdmi->clk);
}
- hdmi->rst = devm_reset_control_get(&pdev->dev, "hdmi");
+ hdmi->rst = devm_reset_control_get_exclusive(&pdev->dev, "hdmi");
if (IS_ERR(hdmi->rst)) {
dev_err(&pdev->dev, "failed to get reset\n");
return PTR_ERR(hdmi->rst);
@@ -2609,7 +2609,7 @@ static int tegra_sor_probe(struct platform_device *pdev)
}
if (!pdev->dev.pm_domain) {
- sor->rst = devm_reset_control_get(&pdev->dev, "sor");
+ sor->rst = devm_reset_control_get_exclusive(&pdev->dev, "sor");
if (IS_ERR(sor->rst)) {
err = PTR_ERR(sor->rst);
dev_err(&pdev->dev, "failed to get reset control: %d\n",
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: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: dri-devel@lists.freedesktop.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- drivers/gpu/drm/tegra/dc.c | 2 +- drivers/gpu/drm/tegra/dpaux.c | 3 ++- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/gr3d.c | 6 +++--- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-)