media: ccs-pll: Start OP pre-PLL multiplier search from correct value

commit 660e613d05e449766784c549faf5927ffaf281f1 upstream.

The ccs_pll_calculate() function does a search over possible PLL
configurations to find the "best" one. If the sensor does not support odd
pre-PLL divisors and the minimum value (with constraints) isn't 1, other
odd values could be errorneously searched (and selected) for the pre-PLL
divisor. Fix this.

Fixes: 415ddd993978 ("media: ccs-pll: Split limits and PLL configuration into front and back parts")
Cc: stable@vger.kernel.org
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c
index 7e5d87a7975fcdd71704246e2485441c0a1afa26..98ffbdf565f30f8a050a97eb5fbbc7c4733c0e75 100644 (file)
--- a/drivers/media/i2c/ccs-pll.c
+++ b/drivers/media/i2c/ccs-pll.c
@@ -817,6 +817,8 @@ int ccs_pll_calculate(struct device *dev, const struct ccs_pll_limits *lim,
                              one_or_more(
                                      DIV_ROUND_UP(op_lim_fr->max_pll_op_clk_freq_hz,
                                                   pll->ext_clk_freq_hz))));
+       if (!(pll->flags & CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER))
+               min_op_pre_pll_clk_div = clk_div_even(min_op_pre_pll_clk_div);
        dev_dbg(dev, "pll_op check: min / max op_pre_pll_clk_div: %u / %u\n",
                min_op_pre_pll_clk_div, max_op_pre_pll_clk_div);