summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/dc.c
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2010-12-16 17:05:42 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:44:56 -0800
commita9fde4bbe27d66a8b0639363de2bbf1f04d27939 (patch)
treee8d2bb71c5022bb1bf46993a88edb398fdbdf695 /drivers/video/tegra/dc/dc.c
parent5a060c3e2643d280c00f6e3190a99e523dae80d2 (diff)
ARM: tegra: dc: Set fixed dc rate on FPGA.
Original-Change-Id: I4c21dcfbcb59aef14656e91badaf9760b5aed498 Reviewed-on: http://git-master/r/13550 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Tested-by: Scott Williams <scwilliams@nvidia.com> Original-Change-Id: Id6eee40265de4e21f269ab12d320152b1a40f8d7 Rebase-Id: R81f450360f01be1eb6dd282fa7b7168eafec09fc
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
-rw-r--r--drivers/video/tegra/dc/dc.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 1e85390bb2e8..01196c6ef04f 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -705,12 +705,21 @@ int tegra_dc_sync_windows(struct tegra_dc_win *windows[], int n)
}
EXPORT_SYMBOL(tegra_dc_sync_windows);
+static unsigned long tegra_dc_clk_get_rate(struct tegra_dc *dc)
+{
+#ifdef CONFIG_TEGRA_FPGA_PLATFORM
+ return 27000000;
+#else
+ return clk_get_rate(dc->clk);
+#endif
+}
+
static unsigned long tegra_dc_pclk_round_rate(struct tegra_dc *dc, int pclk)
{
unsigned long rate;
unsigned long div;
- rate = clk_get_rate(dc->clk);
+ rate = tegra_dc_clk_get_rate(dc);
div = DIV_ROUND_CLOSEST(rate * 2, pclk);
@@ -812,11 +821,7 @@ static int tegra_dc_program_mode(struct tegra_dc *dc, struct tegra_dc_mode *mode
tegra_dc_writel(dc, val, DC_DISP_DISP_INTERFACE_CONTROL);
-#ifdef CONFIG_TEGRA_FPGA_PLATFORM
- rate = 27000000;
-#else
- rate = clk_get_rate(dc->clk);
-#endif
+ rate = tegra_dc_clk_get_rate(dc);
pclk = tegra_dc_pclk_round_rate(dc, mode->pclk);
if (pclk < (mode->pclk / 100 * 99) ||