VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Sean Paul <seanpaul@chromium.org> 2014-09-10 10:52:03 -0400 committer: Thierry Reding <treding@nvidia.com> 2014-11-13 16:11:51 +0100 commit: 26f7a92a3a275cad7b0f39063e8cd92e002aff1a parent: 57b17ae71f412b870415b698655f00846e34ce0a
Commit Summary:
gpu: host1x: mipi: Preserve the contents of MIPI_CAL_CTRL
Diffstat:
1 file changed, 3 insertions, 1 deletion
diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c
index a3e215a0116f..0d8c3ae8db6a 100644
--- a/drivers/gpu/host1x/mipi.c
+++ b/drivers/gpu/host1x/mipi.c
@@ -208,7 +208,9 @@ int tegra_mipi_calibrate(struct tegra_mipi_device *device)
 		tegra_mipi_writel(device->mipi, value, modules[i].reg);
 	}
 
-	tegra_mipi_writel(device->mipi, MIPI_CAL_CTRL_START, MIPI_CAL_CTRL);
+	value = tegra_mipi_readl(device->mipi, MIPI_CAL_CTRL);
+	value |= MIPI_CAL_CTRL_START;
+	tegra_mipi_writel(device->mipi, value, MIPI_CAL_CTRL);
 
 	err = tegra_mipi_wait(device->mipi);