media: ccs-pll: Drop LINK_DECOUPLED flag

The LINK_DECOUPLED flag isn't used by the PLL calculator other than
printing it. The number of OP/VT lanes are already printed in any case.
Thus drop the flag as it has no function.

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 66d046d576f7fe35b6faa879fa5c0c4f052e77c2..16eb09462c8b2ab70bedc5839df21e1c97a441a8 100644 (file)
--- a/drivers/media/i2c/ccs-pll.c
+++ b/drivers/media/i2c/ccs-pll.c
@@ -124,9 +124,8 @@ 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\n",
+       dev_dbg(dev, "flags%s%s%s%s%s%s%s%s\n",
                pll->flags & PLL_FL(LANE_SPEED_MODEL) ? " lane-speed" : "",
-               pll->flags & PLL_FL(LINK_DECOUPLED) ? " link-decoupled" : "",
                pll->flags & PLL_FL(EXT_IP_PLL_DIVIDER) ?
                " ext-ip-pll-divider" : "",
                pll->flags & PLL_FL(FLEXIBLE_OP_PIX_CLK_DIV) ?

diff --git a/drivers/media/i2c/ccs-pll.h b/drivers/media/i2c/ccs-pll.h
index 6eb1b1c68e1e870f6edb4600187f537dae3fe69b..ee206e5b287bdc0eec8cc991c45ca52641f9ff86 100644 (file)
--- a/drivers/media/i2c/ccs-pll.h
+++ b/drivers/media/i2c/ccs-pll.h
@@ -24,7 +24,6 @@
 #define CCS_PLL_FLAG_NO_OP_CLOCKS                              BIT(1)
 /* CCS PLL flags */
 #define CCS_PLL_FLAG_LANE_SPEED_MODEL                          BIT(2)
-#define CCS_PLL_FLAG_LINK_DECOUPLED                            BIT(3)
 #define CCS_PLL_FLAG_EXT_IP_PLL_DIVIDER                                BIT(4)
 #define CCS_PLL_FLAG_FLEXIBLE_OP_PIX_CLK_DIV                   BIT(5)
 #define CCS_PLL_FLAG_FIFO_DERATING                             BIT(6)

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 004d28c3328757729de8ee30d84340a016e31295..06e0ba53f2a848794a5338182b99694f2a3ac92c 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -3451,7 +3451,6 @@ static int ccs_probe(struct i2c_client *client)
                                CCS_LIM(sensor, NUM_OF_VT_LANES) + 1;
                        sensor->pll.op_lanes =
                                CCS_LIM(sensor, NUM_OF_OP_LANES) + 1;
-                       sensor->pll.flags |= CCS_PLL_FLAG_LINK_DECOUPLED;
                } else {
                        sensor->pll.vt_lanes = sensor->pll.csi2.lanes;
                        sensor->pll.op_lanes = sensor->pll.csi2.lanes;

diff --git a/drivers/media/i2c/ccs/ccs-quirk.c b/drivers/media/i2c/ccs/ccs-quirk.c
index e3d4c7a275bc84f92c882979b17e9035e427dae6..e48a4fa1f5ddaf419c27b579e6e3bf21162e42a5 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-quirk.c
+++ b/drivers/media/i2c/ccs/ccs-quirk.c
@@ -190,8 +190,7 @@ static int jt8ev1_post_streamoff(struct ccs_sensor *sensor)
 
 static int jt8ev1_init(struct ccs_sensor *sensor)
 {
-       sensor->pll.flags |= CCS_PLL_FLAG_LANE_SPEED_MODEL |
-               CCS_PLL_FLAG_LINK_DECOUPLED;
+       sensor->pll.flags |= CCS_PLL_FLAG_LANE_SPEED_MODEL;
        sensor->pll.vt_lanes = 1;
        sensor->pll.op_lanes = sensor->pll.csi2.lanes;