OMAPDSS: remove struct dss_clock_info

Remove struct dss_clock_info, as it is not usable in a case where DSS
fclk comes from a dedicated PLL. Instead, just use the fclk rate in
place of dss_clock_info, as that is all that's needed.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index bd48cde53561..16acdddc94e3 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -117,7 +117,7 @@ struct dpi_clk_calc_ctx {
         /* outputs */
 
         struct dsi_clock_info dsi_cinfo;
-        struct dss_clock_info dss_cinfo;
+        unsigned long long fck;
         struct dispc_clock_info dispc_cinfo;
 };
 
@@ -184,12 +184,11 @@ static bool dpi_calc_pll_cb(int regn, int regm, unsigned long fint,
                         dpi_calc_hsdiv_cb, ctx);
 }
 
-static bool dpi_calc_dss_cb(int fckd, unsigned long fck, void *data)
+static bool dpi_calc_dss_cb(unsigned long fck, void *data)
 {
         struct dpi_clk_calc_ctx *ctx = data;
 
-        ctx->dss_cinfo.fck = fck;
-        ctx->dss_cinfo.fck_div = fckd;
+        ctx->fck = fck;
 
         return dispc_div_calc(fck, ctx->pck_min, ctx->pck_max,
                         dpi_calc_dispc_cb, ctx);
@@ -286,13 +285,13 @@ static int dpi_set_dispc_clk(unsigned long pck_req, unsigned long *fck,
         if (!ok)
                 return -EINVAL;
 
-        r = dss_set_clock_div(&ctx.dss_cinfo);
+        r = dss_set_fck_rate(ctx.fck);
         if (r)
                 return r;
 
         dpi.mgr_config.clock_info = ctx.dispc_cinfo;
 
-        *fck = ctx.dss_cinfo.fck;
+        *fck = ctx.fck;
         *lck_div = ctx.dispc_cinfo.lck_div;
         *pck_div = ctx.dispc_cinfo.pck_div;
 
@@ -495,7 +494,7 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
                 if (!ok)
                         return -EINVAL;
 
-                fck = ctx.dss_cinfo.fck;
+                fck = ctx.fck;
         }
 
         lck_div = ctx.dispc_cinfo.lck_div;