提交 cd0715ff 编写于 作者: T Tomi Valkeinen

drm/omap: rename PLL calc functions

Add a "_a" postfix to the type A PLL calc functions, to differentiate
them from the type B PLL calculations which we will add shortly.
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 86c9305c
...@@ -198,7 +198,7 @@ static bool dpi_calc_pll_cb(int n, int m, unsigned long fint, ...@@ -198,7 +198,7 @@ static bool dpi_calc_pll_cb(int n, int m, unsigned long fint,
ctx->dsi_cinfo.fint = fint; ctx->dsi_cinfo.fint = fint;
ctx->dsi_cinfo.clkdco = clkdco; ctx->dsi_cinfo.clkdco = clkdco;
return dss_pll_hsdiv_calc(ctx->pll, clkdco, return dss_pll_hsdiv_calc_a(ctx->pll, clkdco,
ctx->pck_min, dss_feat_get_param_max(FEAT_PARAM_DSS_FCK), ctx->pck_min, dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
dpi_calc_hsdiv_cb, ctx); dpi_calc_hsdiv_cb, ctx);
} }
...@@ -230,7 +230,7 @@ static bool dpi_dsi_clk_calc(struct dpi_data *dpi, unsigned long pck, ...@@ -230,7 +230,7 @@ static bool dpi_dsi_clk_calc(struct dpi_data *dpi, unsigned long pck,
clkin = clk_get_rate(ctx->pll->clkin); clkin = clk_get_rate(ctx->pll->clkin);
return dss_pll_calc(ctx->pll, clkin, return dss_pll_calc_a(ctx->pll, clkin,
pll_min, pll_max, pll_min, pll_max,
dpi_calc_pll_cb, ctx); dpi_calc_pll_cb, ctx);
} }
......
...@@ -4461,7 +4461,7 @@ static bool dsi_cm_calc_pll_cb(int n, int m, unsigned long fint, ...@@ -4461,7 +4461,7 @@ static bool dsi_cm_calc_pll_cb(int n, int m, unsigned long fint,
ctx->dsi_cinfo.fint = fint; ctx->dsi_cinfo.fint = fint;
ctx->dsi_cinfo.clkdco = clkdco; ctx->dsi_cinfo.clkdco = clkdco;
return dss_pll_hsdiv_calc(ctx->pll, clkdco, ctx->req_pck_min, return dss_pll_hsdiv_calc_a(ctx->pll, clkdco, ctx->req_pck_min,
dss_feat_get_param_max(FEAT_PARAM_DSS_FCK), dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
dsi_cm_calc_hsdiv_cb, ctx); dsi_cm_calc_hsdiv_cb, ctx);
} }
...@@ -4500,7 +4500,7 @@ static bool dsi_cm_calc(struct dsi_data *dsi, ...@@ -4500,7 +4500,7 @@ static bool dsi_cm_calc(struct dsi_data *dsi,
pll_min = max(cfg->hs_clk_min * 4, txbyteclk * 4 * 4); pll_min = max(cfg->hs_clk_min * 4, txbyteclk * 4 * 4);
pll_max = cfg->hs_clk_max * 4; pll_max = cfg->hs_clk_max * 4;
return dss_pll_calc(ctx->pll, clkin, return dss_pll_calc_a(ctx->pll, clkin,
pll_min, pll_max, pll_min, pll_max,
dsi_cm_calc_pll_cb, ctx); dsi_cm_calc_pll_cb, ctx);
} }
...@@ -4759,7 +4759,7 @@ static bool dsi_vm_calc_pll_cb(int n, int m, unsigned long fint, ...@@ -4759,7 +4759,7 @@ static bool dsi_vm_calc_pll_cb(int n, int m, unsigned long fint,
ctx->dsi_cinfo.fint = fint; ctx->dsi_cinfo.fint = fint;
ctx->dsi_cinfo.clkdco = clkdco; ctx->dsi_cinfo.clkdco = clkdco;
return dss_pll_hsdiv_calc(ctx->pll, clkdco, ctx->req_pck_min, return dss_pll_hsdiv_calc_a(ctx->pll, clkdco, ctx->req_pck_min,
dss_feat_get_param_max(FEAT_PARAM_DSS_FCK), dss_feat_get_param_max(FEAT_PARAM_DSS_FCK),
dsi_vm_calc_hsdiv_cb, ctx); dsi_vm_calc_hsdiv_cb, ctx);
} }
...@@ -4801,7 +4801,7 @@ static bool dsi_vm_calc(struct dsi_data *dsi, ...@@ -4801,7 +4801,7 @@ static bool dsi_vm_calc(struct dsi_data *dsi,
pll_max = byteclk_max * 4 * 4; pll_max = byteclk_max * 4 * 4;
} }
return dss_pll_calc(ctx->pll, clkin, return dss_pll_calc_a(ctx->pll, clkin,
pll_min, pll_max, pll_min, pll_max,
dsi_vm_calc_pll_cb, ctx); dsi_vm_calc_pll_cb, ctx);
} }
......
...@@ -435,10 +435,10 @@ void dss_pll_disable(struct dss_pll *pll); ...@@ -435,10 +435,10 @@ void dss_pll_disable(struct dss_pll *pll);
int dss_pll_set_config(struct dss_pll *pll, int dss_pll_set_config(struct dss_pll *pll,
const struct dss_pll_clock_info *cinfo); const struct dss_pll_clock_info *cinfo);
bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco, bool dss_pll_hsdiv_calc_a(const struct dss_pll *pll, unsigned long clkdco,
unsigned long out_min, unsigned long out_max, unsigned long out_min, unsigned long out_max,
dss_hsdiv_calc_func func, void *data); dss_hsdiv_calc_func func, void *data);
bool dss_pll_calc(const struct dss_pll *pll, unsigned long clkin, bool dss_pll_calc_a(const struct dss_pll *pll, unsigned long clkin,
unsigned long pll_min, unsigned long pll_max, unsigned long pll_min, unsigned long pll_max,
dss_pll_calc_func func, void *data); dss_pll_calc_func func, void *data);
int dss_pll_write_config_type_a(struct dss_pll *pll, int dss_pll_write_config_type_a(struct dss_pll *pll,
......
...@@ -182,7 +182,7 @@ int dss_pll_set_config(struct dss_pll *pll, const struct dss_pll_clock_info *cin ...@@ -182,7 +182,7 @@ int dss_pll_set_config(struct dss_pll *pll, const struct dss_pll_clock_info *cin
return 0; return 0;
} }
bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco, bool dss_pll_hsdiv_calc_a(const struct dss_pll *pll, unsigned long clkdco,
unsigned long out_min, unsigned long out_max, unsigned long out_min, unsigned long out_max,
dss_hsdiv_calc_func func, void *data) dss_hsdiv_calc_func func, void *data)
{ {
...@@ -207,7 +207,7 @@ bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco, ...@@ -207,7 +207,7 @@ bool dss_pll_hsdiv_calc(const struct dss_pll *pll, unsigned long clkdco,
return false; return false;
} }
bool dss_pll_calc(const struct dss_pll *pll, unsigned long clkin, bool dss_pll_calc_a(const struct dss_pll *pll, unsigned long clkin,
unsigned long pll_min, unsigned long pll_max, unsigned long pll_min, unsigned long pll_max,
dss_pll_calc_func func, void *data) dss_pll_calc_func func, void *data)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册