media: ccs-pll: Add a flag for even PLL multipliers

Some devices (not entirely CCS compliant) only support even PLL
multipliers. Add support for this through a PLL flag.

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>

diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c
index ebbc5e3232444287a179f305aed951a01bbf6570..f4be4e9f6777ee07480d09691384f22585421ba4 100644 (file)
--- a/drivers/media/i2c/ccs-pll.c
+++ b/drivers/media/i2c/ccs-pll.c
@@ -124,9 +124,10 @@ static void print_pll(struct device *dev, const struct ccs_pll *pll)
        dev_dbg(dev, "pixel rate on CSI-2 bus:\t%u\n",
                pll->pixel_rate_csi);
 
-       dev_dbg(dev, "flags%s%s%s%s%s%s%s%s%s%s\n",
+       dev_dbg(dev, "flags%s%s%s%s%s%s%s%s%s%s%s\n",
                pll->flags & PLL_FL(OP_PIX_CLOCK_PER_LANE) ? " op-pix-clock-per-lane" : "",
                pll->flags & PLL_FL(NO_OP_CLOCKS) ? " no-op-clocks" : "",
+               pll->flags & PLL_FL(EVEN_PLL_MULTIPLIER) ? " even-pll-multiplier" : "",
                pll->flags & PLL_FL(LANE_SPEED_MODEL) ? " lane-speed" : "",
                pll->flags & PLL_FL(EXT_IP_PLL_DIVIDER) ?
                " ext-ip-pll-divider" : "",
@@ -312,6 +313,10 @@ __ccs_pll_calculate_vt_tree(struct device *dev,
        more_mul *= DIV_ROUND_UP(lim_fr->min_pll_multiplier, mul * more_mul);
        dev_dbg(dev, "more_mul2: %u\n", more_mul);
 
+       if (pll->flags & CCS_PLL_FLAG_EVEN_PLL_MULTIPLIER &&
+           (mul & 1) && (more_mul & 1))
+               more_mul <<= 1;
+
        pll_fr->pll_multiplier = mul * more_mul;
        if (pll_fr->pll_multiplier > lim_fr->max_pll_multiplier) {
                dev_dbg(dev, "pll multiplier %u too high\n",
@@ -668,6 +673,10 @@ ccs_pll_calculate_op(struct device *dev, const struct ccs_pll_limits *lim,
        if (!is_one_or_even(i))
                i <<= 1;
 
+       if (pll->flags & CCS_PLL_FLAG_EVEN_PLL_MULTIPLIER &&
+           mul & 1 && i & 1)
+               i <<= 1;
+
        dev_dbg(dev, "final more_mul: %u\n", i);
        if (i > more_mul_max) {
                dev_dbg(dev, "final more_mul is bad, max %u\n", more_mul_max);

diff --git a/drivers/media/i2c/ccs-pll.h b/drivers/media/i2c/ccs-pll.h
index ee206e5b287bdc0eec8cc991c45ca52641f9ff86..754eb5f52cc4c60f11c23715035912192eb24937 100644 (file)
--- a/drivers/media/i2c/ccs-pll.h
+++ b/drivers/media/i2c/ccs-pll.h
@@ -22,6 +22,7 @@
 /* op pix clock is for all lanes in total normally */
 #define CCS_PLL_FLAG_OP_PIX_CLOCK_PER_LANE                     BIT(0)
 #define CCS_PLL_FLAG_NO_OP_CLOCKS                              BIT(1)
+#define CCS_PLL_FLAG_EVEN_PLL_MULTIPLIER                       BIT(3)
 /* CCS PLL flags */
 #define CCS_PLL_FLAG_LANE_SPEED_MODEL                          BIT(2)
 #define CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER                                BIT(4)