2 files changed, 12 insertions, 28 deletions

diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index d510ba333e7d..7af97199c905 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -454,7 +454,7 @@ bool dss_div_calc(unsigned long fck_min, dss_div_calc_func func, void *data)
         fckd_hw_max = dss.feat->fck_div_max;
 
         m = dss.feat->dss_fck_multiplier;
-        prate = dss_get_dpll4_rate();
+        prate = clk_get_rate(dss.parent_clk);
 
         fck_min = fck_min ? fck_min : 1;
 
@@ -473,20 +473,13 @@ bool dss_div_calc(unsigned long fck_min, dss_div_calc_func func, void *data)
 
 int dss_set_fck_rate(unsigned long rate)
 {
-        DSSDBG("set fck to %lu\n", rate);
-
-        if (dss.parent_clk) {
-                unsigned long prate;
-                unsigned m;
-                int r;
+        int r;
 
-                prate = clk_get_rate(clk_get_parent(dss.parent_clk));
-                m = dss.feat->dss_fck_multiplier;
+        DSSDBG("set fck to %lu\n", rate);
 
-                r = clk_set_rate(dss.parent_clk, rate * m);
-                if (r)
-                        return r;
-        }
+        r = clk_set_rate(dss.dss_clk, rate);
+        if (r)
+                return r;
 
         dss.dss_clk_rate = clk_get_rate(dss.dss_clk);
 
@@ -497,14 +490,6 @@ int dss_set_fck_rate(unsigned long rate)
         return 0;
 }
 
-unsigned long dss_get_dpll4_rate(void)
-{
-        if (dss.parent_clk)
-                return clk_get_rate(clk_get_parent(dss.parent_clk));
-        else
-                return 0;
-}
-
 unsigned long dss_get_dispc_clk_rate(void)
 {
         return dss.dss_clk_rate;
@@ -522,7 +507,7 @@ static int dss_setup_default_clock(void)
 
         max_dss_fck = dss_feat_get_param_max(FEAT_PARAM_DSS_FCK);
 
-        prate = dss_get_dpll4_rate();
+        prate = clk_get_rate(dss.parent_clk);
 
         fck_div = DIV_ROUND_UP(prate * dss.feat->dss_fck_multiplier,
                         max_dss_fck);
@@ -715,35 +700,35 @@ static const struct dss_features omap24xx_dss_feats __initconst = {
          */
         .fck_div_max            =       6,
         .dss_fck_multiplier     =       2,
-        .parent_clk_name        =       "dss1_fck",
+        .parent_clk_name        =       "core_ck",
         .dpi_select_source      =       &dss_dpi_select_source_omap2_omap3,
 };
 
 static const struct dss_features omap34xx_dss_feats __initconst = {
         .fck_div_max            =       16,
         .dss_fck_multiplier     =       2,
-        .parent_clk_name        =       "dpll4_m4_ck",
+        .parent_clk_name        =       "dpll4_ck",
         .dpi_select_source      =       &dss_dpi_select_source_omap2_omap3,
 };
 
 static const struct dss_features omap3630_dss_feats __initconst = {
         .fck_div_max            =       32,
         .dss_fck_multiplier     =       1,
-        .parent_clk_name        =       "dpll4_m4_ck",
+        .parent_clk_name        =       "dpll4_ck",
         .dpi_select_source      =       &dss_dpi_select_source_omap2_omap3,
 };
 
 static const struct dss_features omap44xx_dss_feats __initconst = {
         .fck_div_max            =       32,
         .dss_fck_multiplier     =       1,
-        .parent_clk_name        =       "dpll_per_m5x2_ck",
+        .parent_clk_name        =       "dpll_per_x2_ck",
         .dpi_select_source      =       &dss_dpi_select_source_omap4,
 };
 
 static const struct dss_features omap54xx_dss_feats __initconst = {
         .fck_div_max            =       64,
         .dss_fck_multiplier     =       1,
-        .parent_clk_name        =       "dpll_per_h12x2_ck",
+        .parent_clk_name        =       "dpll_per_x2_ck",
         .dpi_select_source      =       &dss_dpi_select_source_omap5,
 };
 
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index ead1960ad9d8..6fc786fddbcb 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -242,7 +242,6 @@ enum omap_dss_clk_source dss_get_lcd_clk_source(enum omap_channel channel);
 void dss_set_venc_output(enum omap_dss_venc_type type);
 void dss_set_dac_pwrdn_bgz(bool enable);
 
-unsigned long dss_get_dpll4_rate(void);
 int dss_set_fck_rate(unsigned long rate);
 
 typedef bool (*dss_div_calc_func)(unsigned long fck, void *data);