[PATCH v5 02/16] media: sony-starvis2: Reorder link frequencies to remove lookup
From: Dave Stevenson
Date: Mon Oct 19 2026 - 12:59:51 EST
link_freqs_reg_value is table that just reverses the order of the
link frequency enum.
Reverse the order of the link frequencies so that the table is
redundant, and remove it.
Signed-off-by: Dave Stevenson <dave.stevenson@xxxxxxxxxxxxxxx>
---
drivers/media/i2c/sony-starvis2.c | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/drivers/media/i2c/sony-starvis2.c b/drivers/media/i2c/sony-starvis2.c
index ec5bd64049e1..e5c56a1d09df 100644
--- a/drivers/media/i2c/sony-starvis2.c
+++ b/drivers/media/i2c/sony-starvis2.c
@@ -186,25 +186,14 @@ enum starvis2_lanemode {
/* Link frequency setup (DDR: lane rate = 2 x link freq) */
enum {
- STARVIS2_LINK_FREQ_297MHZ,
- STARVIS2_LINK_FREQ_360MHZ,
- STARVIS2_LINK_FREQ_445MHZ,
- STARVIS2_LINK_FREQ_594MHZ,
- STARVIS2_LINK_FREQ_720MHZ,
- STARVIS2_LINK_FREQ_891MHZ,
- STARVIS2_LINK_FREQ_1039MHZ,
- STARVIS2_LINK_FREQ_1188MHZ,
-};
-
-static const u8 link_freqs_reg_value[] = {
- [STARVIS2_LINK_FREQ_297MHZ] = 0x07,
- [STARVIS2_LINK_FREQ_360MHZ] = 0x06,
- [STARVIS2_LINK_FREQ_445MHZ] = 0x05,
- [STARVIS2_LINK_FREQ_594MHZ] = 0x04,
- [STARVIS2_LINK_FREQ_720MHZ] = 0x03,
- [STARVIS2_LINK_FREQ_891MHZ] = 0x02,
- [STARVIS2_LINK_FREQ_1039MHZ] = 0x01,
- [STARVIS2_LINK_FREQ_1188MHZ] = 0x00,
+ STARVIS2_LINK_FREQ_1188MHZ = 0x00,
+ STARVIS2_LINK_FREQ_1039MHZ = 0x01,
+ STARVIS2_LINK_FREQ_891MHZ = 0x02,
+ STARVIS2_LINK_FREQ_720MHZ = 0x03,
+ STARVIS2_LINK_FREQ_594MHZ = 0x04,
+ STARVIS2_LINK_FREQ_445MHZ = 0x05,
+ STARVIS2_LINK_FREQ_360MHZ = 0x06,
+ STARVIS2_LINK_FREQ_297MHZ = 0x07,
};
static const u64 link_freqs[] = {
@@ -913,7 +902,7 @@ static int starvis2_write_common(struct starvis2 *starvis2)
cci_write(starvis2->cci, STARVIS2_REG_INCK_SEL, starvis2->inck_sel_val,
&ret);
cci_write(starvis2->cci, STARVIS2_REG_DATARATE_SEL,
- link_freqs_reg_value[__ffs(starvis2->link_freq_bitmap)],
+ __fls(starvis2->link_freq_bitmap),
&ret);
cci_write(starvis2->cci, STARVIS2_REG_LANEMODE, starvis2->lane_mode,
&ret);
@@ -1176,7 +1165,7 @@ static int starvis2_init_controls(struct starvis2 *starvis2)
{
struct v4l2_ctrl_handler *ctrl_hdlr;
const u32 hmax_4lane =
- min_hmax_4lane[__ffs(starvis2->link_freq_bitmap)];
+ min_hmax_4lane[__fls(starvis2->link_freq_bitmap)];
const u32 lane_scale =
starvis2->lane_mode == STARVIS2_LANEMODE_2L ? 2 : 1;
struct i2c_client *client = v4l2_get_subdevdata(&starvis2->sd);
--
2.34.1