Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / tegra / dsi.c

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 37b89c3..3387de7 100644 (file)
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -670,6 +670,7 @@ static int tegra_dsi_pad_enable(struct tegra_dsi *dsi)
 static int tegra_dsi_pad_calibrate(struct tegra_dsi *dsi)
 {
        u32 value;
+       int err;
 
        /*
         * XXX Is this still needed? The module reset is deasserted right
@@ -693,7 +694,11 @@ static int tegra_dsi_pad_calibrate(struct tegra_dsi *dsi)
                DSI_PAD_PREEMP_PD(0x03) | DSI_PAD_PREEMP_PU(0x3);
        tegra_dsi_writel(dsi, value, DSI_PAD_CONTROL_3);
 
-       return tegra_mipi_calibrate(dsi->mipi);
+       err = tegra_mipi_calibrate(dsi->mipi);
+       if (err < 0)
+               return err;
+
+       return tegra_mipi_wait(dsi->mipi);
 }
 
 static void tegra_dsi_set_timeout(struct tegra_dsi *dsi, unsigned long bclk,
@@ -1616,7 +1621,7 @@ static int tegra_dsi_probe(struct platform_device *pdev)
        if (IS_ERR(dsi->regs))
                return PTR_ERR(dsi->regs);
 
-       dsi->mipi = tegra_mipi_request(&pdev->dev);
+       dsi->mipi = tegra_mipi_request(&pdev->dev, pdev->dev.of_node);
        if (IS_ERR(dsi->mipi))
                return PTR_ERR(dsi->mipi);