ARM: tegra: pass reset to tegra_powergate_sequence_power_up()

Tegra's clock driver now provides an implementation of the common
reset API (include/linux/reset.h). Use this instead of the old Tegra-
specific API; that will soon be removed.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-By: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index f629e38b00e4..0cbb24b1ae04 100644
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -279,7 +279,8 @@ static int gr3d_probe(struct platform_device *pdev)
                 }
         }
 
-        err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_3D, gr3d->clk);
+        err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_3D, gr3d->clk,
+                                                gr3d->rst);
         if (err < 0) {
                 dev_err(&pdev->dev, "failed to power up 3D unit\n");
                 return err;
@@ -287,7 +288,8 @@ static int gr3d_probe(struct platform_device *pdev)
 
         if (gr3d->clk_secondary) {
                 err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_3D1,
-                                                        gr3d->clk_secondary);
+                                                        gr3d->clk_secondary,
+                                                        gr3d->rst_secondary);
                 if (err < 0) {
                         dev_err(&pdev->dev,
                                 "failed to power up secondary 3D unit\n");