5 files changed, 3 insertions, 19 deletions

diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 12da2fbd7931..707e5afacbec 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -4441,10 +4441,7 @@ static int dsi_get_clocks(struct platform_device *dsidev)
 
         dsi->dss_clk = clk;
 
-        if (cpu_is_omap34xx() || cpu_is_omap3630())
-                clk = clk_get(&dsidev->dev, "dss2_alwon_fck");
-        else
-                clk = clk_get(&dsidev->dev, "sys_clk");
+        clk = clk_get(&dsidev->dev, "sys_clk");
         if (IS_ERR(clk)) {
                 DSSERR("can't get sys_clk\n");
                 clk_put(dsi->dss_clk);
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 0f9c3a6457a5..9423a2ee3aac 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -691,11 +691,6 @@ static void dss_put_clocks(void)
         clk_put(dss.dss_clk);
 }
 
-struct clk *dss_get_ick(void)
-{
-        return clk_get(&dss.pdev->dev, "ick");
-}
-
 int dss_runtime_get(void)
 {
         int r;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 9c94b1152c20..adeff04e964f 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -209,8 +209,6 @@ void dss_uninit_platform_driver(void);
 int dss_runtime_get(void);
 void dss_runtime_put(void);
 
-struct clk *dss_get_ick(void);
-
 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
 const char *dss_get_generic_clk_source_name(enum omap_dss_clk_source clk_src);
 void dss_dump_clocks(struct seq_file *s);
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 1bb8ce11f6bc..50394badec15 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -957,10 +957,7 @@ static int omap_rfbihw_probe(struct platform_device *pdev)
 
         msleep(10);
 
-        if (cpu_is_omap24xx() || cpu_is_omap34xx() || cpu_is_omap3630())
-                clk = dss_get_ick();
-        else
-                clk = clk_get(&pdev->dev, "ick");
+        clk = clk_get(&pdev->dev, "ick");
         if (IS_ERR(clk)) {
                 DSSERR("can't get ick\n");
                 r = PTR_ERR(clk);
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);