Skip to content

Commit

Permalink
OMAPDSS: DISPC: remove dispc fck uses
Browse files Browse the repository at this point in the history
The previous patch changes dispc to get the dispc fck rate from dss core
driver. This was the only use of the dispc fck in dispc, and thus we can
now remove the clock handling.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Dec 12, 2012
1 parent 5aaee69 commit 8105c94
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/video/omap2/dss/dispc.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ static struct {
int ctx_loss_cnt;

int irq;
struct clk *dss_clk;

u32 fifo_size[DISPC_MAX_NR_FIFOS];
/* maps which plane is using a fifo. fifo-id -> plane-id */
Expand Down Expand Up @@ -3619,7 +3618,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
u32 rev;
int r = 0;
struct resource *dispc_mem;
struct clk *clk;

dispc.pdev = pdev;

Expand All @@ -3646,15 +3644,6 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)
return -ENODEV;
}

clk = clk_get(&pdev->dev, "fck");
if (IS_ERR(clk)) {
DSSERR("can't get fck\n");
r = PTR_ERR(clk);
return r;
}

dispc.dss_clk = clk;

pm_runtime_enable(&pdev->dev);

r = dispc_runtime_get();
Expand All @@ -3675,16 +3664,13 @@ static int __init omap_dispchw_probe(struct platform_device *pdev)

err_runtime_get:
pm_runtime_disable(&pdev->dev);
clk_put(dispc.dss_clk);
return r;
}

static int __exit omap_dispchw_remove(struct platform_device *pdev)
{
pm_runtime_disable(&pdev->dev);

clk_put(dispc.dss_clk);

return 0;
}

Expand Down

0 comments on commit 8105c94

Please sign in to comment.