|
@@ -1486,8 +1486,7 @@ static int dsi_calc_clock_rates(struct platform_device *dsidev,
|
|
|
if (cinfo->regm_dsi > dsi->regm_dsi_max)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- cinfo->clkin = clk_get_rate(dsi->sys_clk);
|
|
|
- cinfo->fint = cinfo->clkin / cinfo->regn;
|
|
|
+ cinfo->fint = clk_get_rate(dsi->sys_clk) / cinfo->regn;
|
|
|
|
|
|
if (cinfo->fint > dsi->fint_max || cinfo->fint < dsi->fint_min)
|
|
|
return -EINVAL;
|
|
@@ -1548,7 +1547,6 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
|
|
|
|
|
|
DSSDBG("DSI PLL clock config starts");
|
|
|
|
|
|
- dsi->current_cinfo.clkin = cinfo->clkin;
|
|
|
dsi->current_cinfo.fint = cinfo->fint;
|
|
|
dsi->current_cinfo.clkin4ddr = cinfo->clkin4ddr;
|
|
|
dsi->current_cinfo.dsi_pll_hsdiv_dispc_clk =
|
|
@@ -1563,13 +1561,13 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
|
|
|
|
|
|
DSSDBG("DSI Fint %ld\n", cinfo->fint);
|
|
|
|
|
|
- DSSDBG("clkin rate %ld\n", cinfo->clkin);
|
|
|
+ DSSDBG("clkin rate %ld\n", clk_get_rate(dsi->sys_clk));
|
|
|
|
|
|
/* DSIPHY == CLKIN4DDR */
|
|
|
DSSDBG("CLKIN4DDR = 2 * %d / %d * %lu = %lu\n",
|
|
|
cinfo->regm,
|
|
|
cinfo->regn,
|
|
|
- cinfo->clkin,
|
|
|
+ clk_get_rate(dsi->sys_clk),
|
|
|
cinfo->clkin4ddr);
|
|
|
|
|
|
DSSDBG("Data rate on 1 DSI lane %ld Mbps\n",
|
|
@@ -1771,7 +1769,7 @@ static void dsi_dump_dsidev_clocks(struct platform_device *dsidev,
|
|
|
|
|
|
seq_printf(s, "- DSI%d PLL -\n", dsi_module + 1);
|
|
|
|
|
|
- seq_printf(s, "dsi pll clkin\t%lu\n", cinfo->clkin);
|
|
|
+ seq_printf(s, "dsi pll clkin\t%lu\n", clk_get_rate(dsi->sys_clk));
|
|
|
|
|
|
seq_printf(s, "Fint\t\t%-16luregn %u\n", cinfo->fint, cinfo->regn);
|
|
|
|
|
@@ -4780,7 +4778,6 @@ static bool dsi_cm_calc(struct dsi_data *dsi,
|
|
|
ctx->req_pck_min = pck;
|
|
|
ctx->req_pck_nom = pck;
|
|
|
ctx->req_pck_max = pck * 3 / 2;
|
|
|
- ctx->dsi_cinfo.clkin = clkin;
|
|
|
|
|
|
pll_min = max(cfg->hs_clk_min * 4, txbyteclk * 4 * 4);
|
|
|
pll_max = cfg->hs_clk_max * 4;
|
|
@@ -5066,8 +5063,6 @@ static bool dsi_vm_calc(struct dsi_data *dsi,
|
|
|
ctx->dsidev = dsi->pdev;
|
|
|
ctx->config = cfg;
|
|
|
|
|
|
- ctx->dsi_cinfo.clkin = clkin;
|
|
|
-
|
|
|
/* these limits should come from the panel driver */
|
|
|
ctx->req_pck_min = t->pixelclock - 1000;
|
|
|
ctx->req_pck_nom = t->pixelclock;
|