Skip to content

L
linux
Commit c37f9bf9 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files
Options

[media] smiapp-pll: The clock tree values are unsigned --- fix debug prints 

These values are unsigned, so use %u instead of %d.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bc47150a
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
drivers/media/i2c/smiapp-pll.c
View file @ c37f9bf9
...@@ -65,26 +65,26 @@ static int bounds_check(struct device *dev, uint32_t val, ...@@ -65,26 +65,26 @@ static int bounds_check(struct device *dev, uint32_t val,
static void print_pll(struct device *dev, struct smiapp_pll *pll) static void print_pll(struct device *dev, struct smiapp_pll *pll)
{ {
dev_dbg(dev, "pre_pll_clk_div\t%d\n", pll->pre_pll_clk_div); dev_dbg(dev, "pre_pll_clk_div\t%u\n", pll->pre_pll_clk_div);
dev_dbg(dev, "pll_multiplier \t%d\n", pll->pll_multiplier); dev_dbg(dev, "pll_multiplier \t%u\n", pll->pll_multiplier);
if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) { if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) {
dev_dbg(dev, "op_sys_clk_div \t%d\n", pll->op_sys_clk_div); dev_dbg(dev, "op_sys_clk_div \t%u\n", pll->op_sys_clk_div);
dev_dbg(dev, "op_pix_clk_div \t%d\n", pll->op_pix_clk_div); dev_dbg(dev, "op_pix_clk_div \t%u\n", pll->op_pix_clk_div);
} }
dev_dbg(dev, "vt_sys_clk_div \t%d\n", pll->vt_sys_clk_div); dev_dbg(dev, "vt_sys_clk_div \t%u\n", pll->vt_sys_clk_div);
dev_dbg(dev, "vt_pix_clk_div \t%d\n", pll->vt_pix_clk_div); dev_dbg(dev, "vt_pix_clk_div \t%u\n", pll->vt_pix_clk_div);
dev_dbg(dev, "ext_clk_freq_hz \t%d\n", pll->ext_clk_freq_hz); dev_dbg(dev, "ext_clk_freq_hz \t%u\n", pll->ext_clk_freq_hz);
dev_dbg(dev, "pll_ip_clk_freq_hz \t%d\n", pll->pll_ip_clk_freq_hz); dev_dbg(dev, "pll_ip_clk_freq_hz \t%u\n", pll->pll_ip_clk_freq_hz);
dev_dbg(dev, "pll_op_clk_freq_hz \t%d\n", pll->pll_op_clk_freq_hz); dev_dbg(dev, "pll_op_clk_freq_hz \t%u\n", pll->pll_op_clk_freq_hz);
if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) { if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) {
dev_dbg(dev, "op_sys_clk_freq_hz \t%d\n", dev_dbg(dev, "op_sys_clk_freq_hz \t%u\n",
pll->op_sys_clk_freq_hz); pll->op_sys_clk_freq_hz);
dev_dbg(dev, "op_pix_clk_freq_hz \t%d\n", dev_dbg(dev, "op_pix_clk_freq_hz \t%u\n",
pll->op_pix_clk_freq_hz); pll->op_pix_clk_freq_hz);
} }
dev_dbg(dev, "vt_sys_clk_freq_hz \t%d\n", pll->vt_sys_clk_freq_hz); dev_dbg(dev, "vt_sys_clk_freq_hz \t%u\n", pll->vt_sys_clk_freq_hz);
dev_dbg(dev, "vt_pix_clk_freq_hz \t%d\n", pll->vt_pix_clk_freq_hz); dev_dbg(dev, "vt_pix_clk_freq_hz \t%u\n", pll->vt_pix_clk_freq_hz);
} }
/* /*
...@@ -123,11 +123,11 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -123,11 +123,11 @@ static int __smiapp_pll_calculate(struct device *dev,
* Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be * Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be
* too high. * too high.
*/ */
dev_dbg(dev, "pre_pll_clk_div %d\n", pll->pre_pll_clk_div); dev_dbg(dev, "pre_pll_clk_div %u\n", pll->pre_pll_clk_div);
/* Don't go above max pll multiplier. */ /* Don't go above max pll multiplier. */
more_mul_max = limits->max_pll_multiplier / mul; more_mul_max = limits->max_pll_multiplier / mul;
dev_dbg(dev, "more_mul_max: max_pll_multiplier check: %d\n", dev_dbg(dev, "more_mul_max: max_pll_multiplier check: %u\n",
more_mul_max); more_mul_max);
/* Don't go above max pll op frequency. */ /* Don't go above max pll op frequency. */
more_mul_max = more_mul_max =
...@@ -135,30 +135,30 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -135,30 +135,30 @@ static int __smiapp_pll_calculate(struct device *dev,
more_mul_max, more_mul_max,
limits->max_pll_op_freq_hz limits->max_pll_op_freq_hz
/ (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul)); / (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul));
dev_dbg(dev, "more_mul_max: max_pll_op_freq_hz check: %d\n", dev_dbg(dev, "more_mul_max: max_pll_op_freq_hz check: %u\n",
more_mul_max); more_mul_max);
/* Don't go above the division capability of op sys clock divider. */ /* Don't go above the division capability of op sys clock divider. */
more_mul_max = min(more_mul_max, more_mul_max = min(more_mul_max,
limits->op.max_sys_clk_div * pll->pre_pll_clk_div limits->op.max_sys_clk_div * pll->pre_pll_clk_div
/ div); / div);
dev_dbg(dev, "more_mul_max: max_op_sys_clk_div check: %d\n", dev_dbg(dev, "more_mul_max: max_op_sys_clk_div check: %u\n",
more_mul_max); more_mul_max);
/* Ensure we won't go above min_pll_multiplier. */ /* Ensure we won't go above min_pll_multiplier. */
more_mul_max = min(more_mul_max, more_mul_max = min(more_mul_max,
DIV_ROUND_UP(limits->max_pll_multiplier, mul)); DIV_ROUND_UP(limits->max_pll_multiplier, mul));
dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %d\n", dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %u\n",
more_mul_max); more_mul_max);
/* Ensure we won't go below min_pll_op_freq_hz. */ /* Ensure we won't go below min_pll_op_freq_hz. */
more_mul_min = DIV_ROUND_UP(limits->min_pll_op_freq_hz, more_mul_min = DIV_ROUND_UP(limits->min_pll_op_freq_hz,
pll->ext_clk_freq_hz / pll->pre_pll_clk_div pll->ext_clk_freq_hz / pll->pre_pll_clk_div
* mul); * mul);
dev_dbg(dev, "more_mul_min: min_pll_op_freq_hz check: %d\n", dev_dbg(dev, "more_mul_min: min_pll_op_freq_hz check: %u\n",
more_mul_min); more_mul_min);
/* Ensure we won't go below min_pll_multiplier. */ /* Ensure we won't go below min_pll_multiplier. */
more_mul_min = max(more_mul_min, more_mul_min = max(more_mul_min,
DIV_ROUND_UP(limits->min_pll_multiplier, mul)); DIV_ROUND_UP(limits->min_pll_multiplier, mul));
dev_dbg(dev, "more_mul_min: min_pll_multiplier check: %d\n", dev_dbg(dev, "more_mul_min: min_pll_multiplier check: %u\n",
more_mul_min); more_mul_min);
if (more_mul_min > more_mul_max) { if (more_mul_min > more_mul_max) {
...@@ -168,23 +168,23 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -168,23 +168,23 @@ static int __smiapp_pll_calculate(struct device *dev,
} }
more_mul_factor = lcm(div, pll->pre_pll_clk_div) / div; more_mul_factor = lcm(div, pll->pre_pll_clk_div) / div;
dev_dbg(dev, "more_mul_factor: %d\n", more_mul_factor); dev_dbg(dev, "more_mul_factor: %u\n", more_mul_factor);
more_mul_factor = lcm(more_mul_factor, limits->op.min_sys_clk_div); more_mul_factor = lcm(more_mul_factor, limits->op.min_sys_clk_div);
dev_dbg(dev, "more_mul_factor: min_op_sys_clk_div: %d\n", dev_dbg(dev, "more_mul_factor: min_op_sys_clk_div: %u\n",
more_mul_factor); more_mul_factor);
i = roundup(more_mul_min, more_mul_factor); i = roundup(more_mul_min, more_mul_factor);
if (!is_one_or_even(i)) if (!is_one_or_even(i))
i <<= 1; i <<= 1;
dev_dbg(dev, "final more_mul: %d\n", i); dev_dbg(dev, "final more_mul: %u\n", i);
if (i > more_mul_max) { if (i > more_mul_max) {
dev_dbg(dev, "final more_mul is bad, max %d\n", more_mul_max); dev_dbg(dev, "final more_mul is bad, max %u\n", more_mul_max);
return -EINVAL; return -EINVAL;
} }
pll->pll_multiplier = mul * i; pll->pll_multiplier = mul * i;
pll->op_sys_clk_div = div * i / pll->pre_pll_clk_div; pll->op_sys_clk_div = div * i / pll->pre_pll_clk_div;
dev_dbg(dev, "op_sys_clk_div: %d\n", pll->op_sys_clk_div); dev_dbg(dev, "op_sys_clk_div: %u\n", pll->op_sys_clk_div);
pll->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz pll->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz
/ pll->pre_pll_clk_div; / pll->pre_pll_clk_div;
...@@ -197,7 +197,7 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -197,7 +197,7 @@ static int __smiapp_pll_calculate(struct device *dev,
pll->pll_op_clk_freq_hz / pll->op_sys_clk_div; pll->pll_op_clk_freq_hz / pll->op_sys_clk_div;
pll->op_pix_clk_div = pll->bits_per_pixel; pll->op_pix_clk_div = pll->bits_per_pixel;
dev_dbg(dev, "op_pix_clk_div: %d\n", pll->op_pix_clk_div); dev_dbg(dev, "op_pix_clk_div: %u\n", pll->op_pix_clk_div);
pll->op_pix_clk_freq_hz = pll->op_pix_clk_freq_hz =
pll->op_sys_clk_freq_hz / pll->op_pix_clk_div; pll->op_sys_clk_freq_hz / pll->op_pix_clk_div;
...@@ -214,7 +214,7 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -214,7 +214,7 @@ static int __smiapp_pll_calculate(struct device *dev,
vt_op_binning_div = pll->binning_horizontal; vt_op_binning_div = pll->binning_horizontal;
else else
vt_op_binning_div = 1; vt_op_binning_div = 1;
dev_dbg(dev, "vt_op_binning_div: %d\n", vt_op_binning_div); dev_dbg(dev, "vt_op_binning_div: %u\n", vt_op_binning_div);
/* /*
* Profile 2 supports vt_pix_clk_div E [4, 10] * Profile 2 supports vt_pix_clk_div E [4, 10]
...@@ -227,30 +227,30 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -227,30 +227,30 @@ static int __smiapp_pll_calculate(struct device *dev,
* *
* Find absolute limits for the factor of vt divider. * Find absolute limits for the factor of vt divider.
*/ */
dev_dbg(dev, "scale_m: %d\n", pll->scale_m); dev_dbg(dev, "scale_m: %u\n", pll->scale_m);
min_vt_div = DIV_ROUND_UP(pll->op_pix_clk_div * pll->op_sys_clk_div min_vt_div = DIV_ROUND_UP(pll->op_pix_clk_div * pll->op_sys_clk_div
* pll->scale_n, * pll->scale_n,
lane_op_clock_ratio * vt_op_binning_div lane_op_clock_ratio * vt_op_binning_div
* pll->scale_m); * pll->scale_m);
/* Find smallest and biggest allowed vt divisor. */ /* Find smallest and biggest allowed vt divisor. */
dev_dbg(dev, "min_vt_div: %d\n", min_vt_div); dev_dbg(dev, "min_vt_div: %u\n", min_vt_div);
min_vt_div = max(min_vt_div, min_vt_div = max(min_vt_div,
DIV_ROUND_UP(pll->pll_op_clk_freq_hz, DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
limits->vt.max_pix_clk_freq_hz)); limits->vt.max_pix_clk_freq_hz));
dev_dbg(dev, "min_vt_div: max_vt_pix_clk_freq_hz: %d\n", dev_dbg(dev, "min_vt_div: max_vt_pix_clk_freq_hz: %u\n",
min_vt_div); min_vt_div);
min_vt_div = max_t(uint32_t, min_vt_div, min_vt_div = max_t(uint32_t, min_vt_div,
limits->vt.min_pix_clk_div limits->vt.min_pix_clk_div
* limits->vt.min_sys_clk_div); * limits->vt.min_sys_clk_div);
dev_dbg(dev, "min_vt_div: min_vt_clk_div: %d\n", min_vt_div); dev_dbg(dev, "min_vt_div: min_vt_clk_div: %u\n", min_vt_div);
max_vt_div = limits->vt.max_sys_clk_div * limits->vt.max_pix_clk_div; max_vt_div = limits->vt.max_sys_clk_div * limits->vt.max_pix_clk_div;
dev_dbg(dev, "max_vt_div: %d\n", max_vt_div); dev_dbg(dev, "max_vt_div: %u\n", max_vt_div);
max_vt_div = min(max_vt_div, max_vt_div = min(max_vt_div,
DIV_ROUND_UP(pll->pll_op_clk_freq_hz, DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
limits->vt.min_pix_clk_freq_hz)); limits->vt.min_pix_clk_freq_hz));
dev_dbg(dev, "max_vt_div: min_vt_pix_clk_freq_hz: %d\n", dev_dbg(dev, "max_vt_div: min_vt_pix_clk_freq_hz: %u\n",
max_vt_div); max_vt_div);
/* /*
...@@ -258,28 +258,28 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -258,28 +258,28 @@ static int __smiapp_pll_calculate(struct device *dev,
* with all values of pix_clk_div. * with all values of pix_clk_div.
*/ */
min_sys_div = limits->vt.min_sys_clk_div; min_sys_div = limits->vt.min_sys_clk_div;
dev_dbg(dev, "min_sys_div: %d\n", min_sys_div); dev_dbg(dev, "min_sys_div: %u\n", min_sys_div);
min_sys_div = max(min_sys_div, min_sys_div = max(min_sys_div,
DIV_ROUND_UP(min_vt_div, DIV_ROUND_UP(min_vt_div,
limits->vt.max_pix_clk_div)); limits->vt.max_pix_clk_div));
dev_dbg(dev, "min_sys_div: max_vt_pix_clk_div: %d\n", min_sys_div); dev_dbg(dev, "min_sys_div: max_vt_pix_clk_div: %u\n", min_sys_div);
min_sys_div = max(min_sys_div, min_sys_div = max(min_sys_div,
pll->pll_op_clk_freq_hz pll->pll_op_clk_freq_hz
/ limits->vt.max_sys_clk_freq_hz); / limits->vt.max_sys_clk_freq_hz);
dev_dbg(dev, "min_sys_div: max_pll_op_clk_freq_hz: %d\n", min_sys_div); dev_dbg(dev, "min_sys_div: max_pll_op_clk_freq_hz: %u\n", min_sys_div);
min_sys_div = clk_div_even_up(min_sys_div); min_sys_div = clk_div_even_up(min_sys_div);
dev_dbg(dev, "min_sys_div: one or even: %d\n", min_sys_div); dev_dbg(dev, "min_sys_div: one or even: %u\n", min_sys_div);
max_sys_div = limits->vt.max_sys_clk_div; max_sys_div = limits->vt.max_sys_clk_div;
dev_dbg(dev, "max_sys_div: %d\n", max_sys_div); dev_dbg(dev, "max_sys_div: %u\n", max_sys_div);
max_sys_div = min(max_sys_div, max_sys_div = min(max_sys_div,
DIV_ROUND_UP(max_vt_div, DIV_ROUND_UP(max_vt_div,
limits->vt.min_pix_clk_div)); limits->vt.min_pix_clk_div));
dev_dbg(dev, "max_sys_div: min_vt_pix_clk_div: %d\n", max_sys_div); dev_dbg(dev, "max_sys_div: min_vt_pix_clk_div: %u\n", max_sys_div);
max_sys_div = min(max_sys_div, max_sys_div = min(max_sys_div,
DIV_ROUND_UP(pll->pll_op_clk_freq_hz, DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
limits->vt.min_pix_clk_freq_hz)); limits->vt.min_pix_clk_freq_hz));
dev_dbg(dev, "max_sys_div: min_vt_pix_clk_freq_hz: %d\n", max_sys_div); dev_dbg(dev, "max_sys_div: min_vt_pix_clk_freq_hz: %u\n", max_sys_div);
/* /*
* Find pix_div such that a legal pix_div * sys_div results * Find pix_div such that a legal pix_div * sys_div results
...@@ -296,7 +296,7 @@ static int __smiapp_pll_calculate(struct device *dev, ...@@ -296,7 +296,7 @@ static int __smiapp_pll_calculate(struct device *dev,
if (pix_div < limits->vt.min_pix_clk_div if (pix_div < limits->vt.min_pix_clk_div
|| pix_div > limits->vt.max_pix_clk_div) { || pix_div > limits->vt.max_pix_clk_div) {
dev_dbg(dev, dev_dbg(dev,
"pix_div %d too small or too big (%d--%d)\n", "pix_div %u too small or too big (%u--%u)\n",
pix_div, pix_div,
limits->vt.min_pix_clk_div, limits->vt.min_pix_clk_div,
limits->vt.max_pix_clk_div); limits->vt.max_pix_clk_div);
...@@ -390,9 +390,9 @@ int smiapp_pll_calculate(struct device *dev, ...@@ -390,9 +390,9 @@ int smiapp_pll_calculate(struct device *dev,
lane_op_clock_ratio = pll->csi2.lanes; lane_op_clock_ratio = pll->csi2.lanes;
else else
lane_op_clock_ratio = 1; lane_op_clock_ratio = 1;
dev_dbg(dev, "lane_op_clock_ratio: %d\n", lane_op_clock_ratio); dev_dbg(dev, "lane_op_clock_ratio: %u\n", lane_op_clock_ratio);
dev_dbg(dev, "binning: %dx%d\n", pll->binning_horizontal, dev_dbg(dev, "binning: %ux%u\n", pll->binning_horizontal,
pll->binning_vertical); pll->binning_vertical);
switch (pll->bus_type) { switch (pll->bus_type) {
...@@ -411,7 +411,7 @@ int smiapp_pll_calculate(struct device *dev, ...@@ -411,7 +411,7 @@ int smiapp_pll_calculate(struct device *dev,
} }
/* Figure out limits for pre-pll divider based on extclk */ /* Figure out limits for pre-pll divider based on extclk */
dev_dbg(dev, "min / max pre_pll_clk_div: %d / %d\n", dev_dbg(dev, "min / max pre_pll_clk_div: %u / %u\n",
limits->min_pre_pll_clk_div, limits->max_pre_pll_clk_div); limits->min_pre_pll_clk_div, limits->max_pre_pll_clk_div);
max_pre_pll_clk_div = max_pre_pll_clk_div =
min_t(uint16_t, limits->max_pre_pll_clk_div, min_t(uint16_t, limits->max_pre_pll_clk_div,
...@@ -422,20 +422,20 @@ int smiapp_pll_calculate(struct device *dev, ...@@ -422,20 +422,20 @@ int smiapp_pll_calculate(struct device *dev,
clk_div_even_up( clk_div_even_up(
DIV_ROUND_UP(pll->ext_clk_freq_hz, DIV_ROUND_UP(pll->ext_clk_freq_hz,
limits->max_pll_ip_freq_hz))); limits->max_pll_ip_freq_hz)));
dev_dbg(dev, "pre-pll check: min / max pre_pll_clk_div: %d / %d\n", dev_dbg(dev, "pre-pll check: min / max pre_pll_clk_div: %u / %u\n",
min_pre_pll_clk_div, max_pre_pll_clk_div); min_pre_pll_clk_div, max_pre_pll_clk_div);
i = gcd(pll->pll_op_clk_freq_hz, pll->ext_clk_freq_hz); i = gcd(pll->pll_op_clk_freq_hz, pll->ext_clk_freq_hz);
mul = div_u64(pll->pll_op_clk_freq_hz, i); mul = div_u64(pll->pll_op_clk_freq_hz, i);
div = pll->ext_clk_freq_hz / i; div = pll->ext_clk_freq_hz / i;
dev_dbg(dev, "mul %d / div %d\n", mul, div); dev_dbg(dev, "mul %u / div %u\n", mul, div);
min_pre_pll_clk_div = min_pre_pll_clk_div =
max_t(uint16_t, min_pre_pll_clk_div, max_t(uint16_t, min_pre_pll_clk_div,
clk_div_even_up( clk_div_even_up(
DIV_ROUND_UP(mul * pll->ext_clk_freq_hz, DIV_ROUND_UP(mul * pll->ext_clk_freq_hz,
limits->max_pll_op_freq_hz))); limits->max_pll_op_freq_hz)));
dev_dbg(dev, "pll_op check: min / max pre_pll_clk_div: %d / %d\n", dev_dbg(dev, "pll_op check: min / max pre_pll_clk_div: %u / %u\n",
min_pre_pll_clk_div, max_pre_pll_clk_div); min_pre_pll_clk_div, max_pre_pll_clk_div);
for (pll->pre_pll_clk_div = min_pre_pll_clk_div; for (pll->pre_pll_clk_div = min_pre_pll_clk_div;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7