Skip to content

Add GPS avoidance option to IMX477 #6468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naushir merged 2 commits into from
Nov 15, 2024
Merged

Add GPS avoidance option to IMX477 #6468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
049a563
media: i2c: imx477: Add options for slightly modifying the link freq
6by9 Nov 14, 2024
46442e9
dtoverlays: Add link-frequency override to imx477/378 overlay
6by9 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2780,6 +2780,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
camera clamping I/Os such as XVS to 0V.
sync-source Configure as vsync source
sync-sink Configure as vsync sink
link-frequency Allowable link frequency values to use in Hz:
450000000 (default), 453000000, 456000000.


Name: imx462
Expand Down Expand Up @@ -2822,6 +2824,8 @@ Params: rotation Mounting rotation of the camera sensor (0 or
camera clamping I/Os such as XVS to 0V.
sync-source Configure as vsync source
sync-sink Configure as vsync sink
link-frequency Allowable link frequency values to use in Hz:
450000000 (default), 453000000, 456000000.


Name: imx500
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<&cam_node>, "clocks:0=",<&cam0_clk>,
<&cam_node>, "VANA-supply:0=",<&cam0_reg>;
always-on = <0>, "+99";
link-frequency = <&cam_endpoint>,"link-frequencies#0";
};
};

Expand Down
86 changes: 67 additions & 19 deletions drivers/media/i2c/imx477.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,48 @@ struct imx477_mode {
struct imx477_reg_list reg_list;
};

static const s64 imx477_link_freq_menu[] = {
IMX477_DEFAULT_LINK_FREQ,
/* Link frequency setup */
enum {
IMX477_LINK_FREQ_450MHZ,
IMX477_LINK_FREQ_453MHZ,
IMX477_LINK_FREQ_456MHZ,
};

static const s64 link_freqs[] = {
[IMX477_LINK_FREQ_450MHZ] = 450000000,
[IMX477_LINK_FREQ_453MHZ] = 453000000,
[IMX477_LINK_FREQ_456MHZ] = 456000000,
};

/* 450MHz is the nominal "default" link frequency */
static const struct imx477_reg link_450Mhz_regs[] = {
{0x030E, 0x00},
{0x030F, 0x96},
};

static const struct imx477_reg link_453Mhz_regs[] = {
{0x030E, 0x00},
{0x030F, 0x97},
};

static const struct imx477_reg link_456Mhz_regs[] = {
{0x030E, 0x00},
{0x030F, 0x98},
};

static const struct imx477_reg_list link_freq_regs[] = {
[IMX477_LINK_FREQ_450MHZ] = {
.regs = link_450Mhz_regs,
.num_of_regs = ARRAY_SIZE(link_450Mhz_regs)
},
[IMX477_LINK_FREQ_453MHZ] = {
.regs = link_453Mhz_regs,
.num_of_regs = ARRAY_SIZE(link_453Mhz_regs)
},
[IMX477_LINK_FREQ_456MHZ] = {
.regs = link_456Mhz_regs,
.num_of_regs = ARRAY_SIZE(link_456Mhz_regs)
},
};

static const struct imx477_reg mode_common_regs[] = {
Expand Down Expand Up @@ -558,8 +598,6 @@ static const struct imx477_reg mode_4056x3040_regs[] = {
{0x0309, 0x0c},
{0x030b, 0x02},
{0x030d, 0x02},
{0x030e, 0x00},
{0x030f, 0x96},
{0x0310, 0x01},
{0x0820, 0x07},
{0x0821, 0x08},
Expand Down Expand Up @@ -659,8 +697,6 @@ static const struct imx477_reg mode_2028x1520_regs[] = {
{0x0309, 0x0c},
{0x030b, 0x02},
{0x030d, 0x02},
{0x030e, 0x00},
{0x030f, 0x96},
{0x0310, 0x01},
{0x0820, 0x07},
{0x0821, 0x08},
Expand Down Expand Up @@ -760,8 +796,6 @@ static const struct imx477_reg mode_2028x1080_regs[] = {
{0x0309, 0x0c},
{0x030b, 0x02},
{0x030d, 0x02},
{0x030e, 0x00},
{0x030f, 0x96},
{0x0310, 0x01},
{0x0820, 0x07},
{0x0821, 0x08},
Expand Down Expand Up @@ -890,8 +924,6 @@ static const struct imx477_reg mode_1332x990_regs[] = {
{0x0309, 0x0a},
{0x030b, 0x02},
{0x030d, 0x02},
{0x030e, 0x00},
{0x030f, 0x96},
{0x0310, 0x01},
{0x0820, 0x07},
{0x0821, 0x08},
Expand Down Expand Up @@ -1121,6 +1153,8 @@ struct imx477 {
struct v4l2_ctrl *vblank;
struct v4l2_ctrl *hblank;

unsigned int link_freq_idx;

/* Current mode */
const struct imx477_mode *mode;

Expand Down Expand Up @@ -1712,7 +1746,7 @@ static int imx477_get_selection(struct v4l2_subdev *sd,
static int imx477_start_streaming(struct imx477 *imx477)
{
struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
const struct imx477_reg_list *reg_list;
const struct imx477_reg_list *reg_list, *freq_regs;
const struct imx477_reg_list *extra_regs;
int ret, tm;

Expand All @@ -1725,6 +1759,13 @@ static int imx477_start_streaming(struct imx477 *imx477)
extra_regs->num_of_regs);
}

if (!ret) {
/* Update the link frequency registers */
freq_regs = &link_freq_regs[imx477->link_freq_idx];
ret = imx477_write_regs(imx477, freq_regs->regs,
freq_regs->num_of_regs);
}

if (ret) {
dev_err(&client->dev, "%s failed to set common settings\n",
__func__);
Expand Down Expand Up @@ -2010,9 +2051,8 @@ static int imx477_init_controls(struct imx477 *imx477)
/* LINK_FREQ is also read only */
imx477->link_freq =
v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx477_ctrl_ops,
V4L2_CID_LINK_FREQ,
ARRAY_SIZE(imx477_link_freq_menu) - 1, 0,
imx477_link_freq_menu);
V4L2_CID_LINK_FREQ, 1, 0,
&link_freqs[imx477->link_freq_idx]);
if (imx477->link_freq)
imx477->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;

Expand Down Expand Up @@ -2110,13 +2150,14 @@ static void imx477_free_controls(struct imx477 *imx477)
mutex_destroy(&imx477->mutex);
}

static int imx477_check_hwcfg(struct device *dev)
static int imx477_check_hwcfg(struct device *dev, struct imx477 *imx477)
{
struct fwnode_handle *endpoint;
struct v4l2_fwnode_endpoint ep_cfg = {
.bus_type = V4L2_MBUS_CSI2_DPHY
};
int ret = -EINVAL;
int i;

endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
if (!endpoint) {
Expand All @@ -2141,11 +2182,18 @@ static int imx477_check_hwcfg(struct device *dev)
goto error_out;
}

if (ep_cfg.nr_of_link_frequencies != 1 ||
ep_cfg.link_frequencies[0] != IMX477_DEFAULT_LINK_FREQ) {
for (i = 0; i < ARRAY_SIZE(link_freqs); i++) {
if (link_freqs[i] == ep_cfg.link_frequencies[0]) {
imx477->link_freq_idx = i;
break;
}
}

if (i == ARRAY_SIZE(link_freqs)) {
dev_err(dev, "Link frequency not supported: %lld\n",
ep_cfg.link_frequencies[0]);
goto error_out;
ret = -EINVAL;
goto error_out;
}

ret = 0;
Expand Down Expand Up @@ -2206,7 +2254,7 @@ static int imx477_probe(struct i2c_client *client)
(const struct imx477_compatible_data *)match->data;

/* Check the hardware configuration in device tree */
if (imx477_check_hwcfg(dev))
if (imx477_check_hwcfg(dev, imx477))
return -EINVAL;

/* Default the trigger mode from OF to -1, which means invalid */
Expand Down