diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-08-04 04:22:54 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-20 04:21:31 -0400 |
commit | bfe4f8d32df9d2afa5fb0dccca9dfdef8573f04a (patch) | |
tree | c4b6841161978d304ae65ba539a99717d5e51c14 /drivers/video/omap2/dss/venc.c | |
parent | e13a138bc68259dc630cb903942975efa40d2bd9 (diff) |
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) | |||
741 | venc.tv_clk = clk; | 741 | venc.tv_clk = clk; |
742 | 742 | ||
743 | if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) { | 743 | if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) { |
744 | if (cpu_is_omap34xx() || cpu_is_omap3630()) | 744 | clk = clk_get(&pdev->dev, "tv_dac_clk"); |
745 | clk = clk_get(&pdev->dev, "dss_96m_fck"); | ||
746 | else | ||
747 | clk = clk_get(&pdev->dev, "tv_dac_clk"); | ||
748 | if (IS_ERR(clk)) { | 745 | if (IS_ERR(clk)) { |
749 | DSSERR("can't get tv_dac_clk\n"); | 746 | DSSERR("can't get tv_dac_clk\n"); |
750 | clk_put(venc.tv_clk); | 747 | clk_put(venc.tv_clk); |