| Message ID | 20250417065354.311617-7-sakari.ailus@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | CCS PLL fixes and improvements | expand |
Hi Sakari, Thank you for the patch. On Thu, Apr 17, 2025 at 09:53:49AM +0300, Sakari Ailus wrote: > The LINK_DECOUPLED flag wasn't used by the PLL calculator other than s/wasn't/isn't/ > 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> > --- > drivers/media/i2c/ccs-pll.c | 3 +-- > drivers/media/i2c/ccs-pll.h | 1 - > drivers/media/i2c/ccs/ccs-core.c | 1 - > drivers/media/i2c/ccs/ccs-quirk.c | 3 +-- > 4 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c > index 66d046d576f7..16eb09462c8b 100644 > --- 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 6eb1b1c68e1e..ee206e5b287b 100644 > --- 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 004d28c33287..06e0ba53f2a8 100644 > --- 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 e3d4c7a275bc..e48a4fa1f5dd 100644 > --- 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; >
diff --git a/drivers/media/i2c/ccs-pll.c b/drivers/media/i2c/ccs-pll.c index 66d046d576f7..16eb09462c8b 100644 --- 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 6eb1b1c68e1e..ee206e5b287b 100644 --- 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 004d28c33287..06e0ba53f2a8 100644 --- 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 e3d4c7a275bc..e48a4fa1f5dd 100644 --- 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;
The LINK_DECOUPLED flag wasn'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> --- drivers/media/i2c/ccs-pll.c | 3 +-- drivers/media/i2c/ccs-pll.h | 1 - drivers/media/i2c/ccs/ccs-core.c | 1 - drivers/media/i2c/ccs/ccs-quirk.c | 3 +-- 4 files changed, 2 insertions(+), 6 deletions(-)