diff options
| author | Tomi Valkeinen | 2011-08-04 10:22:54 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2011-09-20 10:21:31 +0200 |
| commit | bfe4f8d32df9d2afa5fb0dccca9dfdef8573f04a (patch) | |
| tree | c4b6841161978d304ae65ba539a99717d5e51c14 /drivers/video/omap2/dss/venc.c | |
| parent | OMAP: DSS2: Use a macro to declare size of the fifo_size array in dispc.c (diff) | |
| download | kernel-qcow2-linux-bfe4f8d32df9d2afa5fb0dccca9dfdef8573f04a.tar.gz kernel-qcow2-linux-bfe4f8d32df9d2afa5fb0dccca9dfdef8573f04a.tar.xz kernel-qcow2-linux-bfe4f8d32df9d2afa5fb0dccca9dfdef8573f04a.zip | |
Revert "HACK: OMAP: DSS2: clk hack for OMAP2/3"
This reverts commit 9ede365aa6f74428a1f69c21ca1cf21213167576.
The hack is no longer needed, as the HWMOD data has been fixed.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 173c66430dad..71e005df1759 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -741,10 +741,7 @@ static int venc_get_clocks(struct platform_device *pdev) venc.tv_clk = clk; if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) { - if (cpu_is_omap34xx() || cpu_is_omap3630()) - clk = clk_get(&pdev->dev, "dss_96m_fck"); - else - clk = clk_get(&pdev->dev, "tv_dac_clk"); + clk = clk_get(&pdev->dev, "tv_dac_clk"); if (IS_ERR(clk)) { DSSERR("can't get tv_dac_clk\n"); clk_put(venc.tv_clk); |