[ARM/tegra] Add initial Tegra3 driver support
Scott Williams [Tue, 7 Dec 2010 19:13:31 +0000 (11:13 -0800)]
Bug 764354

Original-Change-Id: I807433ff825bed1fe91ce0cf50a2b3691c64ef0a
Reviewed-on: http://git-master/r/12227
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I3da91a438f98f2f51618446ce024f3fefd726a19

Rebase-Id: Rb1717b1f80aaf0242f4da555ce16c06946b7d072

drivers/video/tegra/dc/dc.c
drivers/video/tegra/nvmap/nvmap_dev.c

index 862b368..1e85390 100644 (file)
@@ -812,7 +812,11 @@ 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
 
        pclk = tegra_dc_pclk_round_rate(dc, mode->pclk);
        if (pclk < (mode->pclk / 100 * 99) ||
index 0e988ed..91ed03d 100644 (file)
@@ -1097,7 +1097,8 @@ static int nvmap_probe(struct platform_device *pdev)
        init_waitqueue_head(&dev->iovmm_master.pin_wait);
        mutex_init(&dev->iovmm_master.pin_lock);
        dev->iovmm_master.iovmm =
-               tegra_iovmm_alloc_client(dev_name(&pdev->dev), NULL);
+               tegra_iovmm_alloc_client(dev_name(&pdev->dev), NULL,
+                       &(dev->dev_user));
        if (IS_ERR(dev->iovmm_master.iovmm)) {
                e = PTR_ERR(dev->iovmm_master.iovmm);
                dev_err(&pdev->dev, "couldn't create iovmm client\n");