mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
112 lines
3.3 KiB
Diff
112 lines
3.3 KiB
Diff
|
From 84ab77459e61c648299d32464127b89ca65de40a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Date: Tue, 15 Oct 2024 19:46:01 +0100
|
||
|
|
Subject: [PATCH 1330/1350] media: i2c: ov5647: Add V4L2_CID_LINK_FREQUENCY
|
||
|
|
control
|
||
|
|
|
||
|
|
The link frequency can vary between modes, so add it as a
|
||
|
|
control.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
---
|
||
|
|
drivers/media/i2c/ov5647.c | 25 ++++++++++++++++++++++++-
|
||
|
|
1 file changed, 24 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/media/i2c/ov5647.c
|
||
|
|
+++ b/drivers/media/i2c/ov5647.c
|
||
|
|
@@ -97,6 +97,13 @@ static const char * const ov5647_supply_
|
||
|
|
|
||
|
|
#define OV5647_NUM_SUPPLIES ARRAY_SIZE(ov5647_supply_names)
|
||
|
|
|
||
|
|
+#define FREQ_INDEX_FULL 0
|
||
|
|
+#define FREQ_INDEX_VGA 1
|
||
|
|
+static const s64 ov5647_link_freqs[] = {
|
||
|
|
+ [FREQ_INDEX_FULL] = 218500000,
|
||
|
|
+ [FREQ_INDEX_VGA] = 208333000,
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
struct regval_list {
|
||
|
|
u16 addr;
|
||
|
|
u8 data;
|
||
|
|
@@ -106,6 +113,7 @@ struct ov5647_mode {
|
||
|
|
struct v4l2_mbus_framefmt format;
|
||
|
|
struct v4l2_rect crop;
|
||
|
|
u64 pixel_rate;
|
||
|
|
+ unsigned int link_freq_index;
|
||
|
|
int hts;
|
||
|
|
int vts;
|
||
|
|
const struct regval_list *reg_list;
|
||
|
|
@@ -128,6 +136,7 @@ struct ov5647 {
|
||
|
|
struct v4l2_ctrl *exposure;
|
||
|
|
struct v4l2_ctrl *hflip;
|
||
|
|
struct v4l2_ctrl *vflip;
|
||
|
|
+ struct v4l2_ctrl *link_freq;
|
||
|
|
bool streaming;
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -377,6 +386,7 @@ static const struct ov5647_mode ov5647_m
|
||
|
|
.height = 1944
|
||
|
|
},
|
||
|
|
.pixel_rate = 87500000,
|
||
|
|
+ .link_freq_index = FREQ_INDEX_FULL,
|
||
|
|
.hts = 2844,
|
||
|
|
.vts = 0x7b0,
|
||
|
|
.reg_list = ov5647_2592x1944_10bpp,
|
||
|
|
@@ -398,6 +408,7 @@ static const struct ov5647_mode ov5647_m
|
||
|
|
.height = 1080,
|
||
|
|
},
|
||
|
|
.pixel_rate = 87500000,
|
||
|
|
+ .link_freq_index = FREQ_INDEX_FULL,
|
||
|
|
.hts = 2416,
|
||
|
|
.vts = 0x450,
|
||
|
|
.reg_list = ov5647_1080p30_10bpp,
|
||
|
|
@@ -419,6 +430,7 @@ static const struct ov5647_mode ov5647_m
|
||
|
|
.height = 1944,
|
||
|
|
},
|
||
|
|
.pixel_rate = 87500000,
|
||
|
|
+ .link_freq_index = FREQ_INDEX_FULL,
|
||
|
|
.hts = 1896,
|
||
|
|
.vts = 0x59b,
|
||
|
|
.reg_list = ov5647_2x2binned_10bpp,
|
||
|
|
@@ -440,6 +452,7 @@ static const struct ov5647_mode ov5647_m
|
||
|
|
.height = 1920,
|
||
|
|
},
|
||
|
|
.pixel_rate = 55000000,
|
||
|
|
+ .link_freq_index = FREQ_INDEX_VGA,
|
||
|
|
.hts = 1852,
|
||
|
|
.vts = 0x1f8,
|
||
|
|
.reg_list = ov5647_640x480_10bpp,
|
||
|
|
@@ -943,6 +956,8 @@ static int ov5647_set_pad_fmt(struct v4l
|
||
|
|
sensor->exposure->minimum,
|
||
|
|
exposure_max, sensor->exposure->step,
|
||
|
|
exposure_def);
|
||
|
|
+
|
||
|
|
+ __v4l2_ctrl_s_ctrl(sensor->link_freq, mode->link_freq_index);
|
||
|
|
}
|
||
|
|
*fmt = mode->format;
|
||
|
|
/* The code we pass back must reflect the current h/vflips. */
|
||
|
|
@@ -1248,7 +1263,7 @@ static int ov5647_init_controls(struct o
|
||
|
|
int hblank, exposure_max, exposure_def;
|
||
|
|
struct v4l2_fwnode_device_properties props;
|
||
|
|
|
||
|
|
- v4l2_ctrl_handler_init(&sensor->ctrls, 9);
|
||
|
|
+ v4l2_ctrl_handler_init(&sensor->ctrls, 10);
|
||
|
|
|
||
|
|
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
||
|
|
V4L2_CID_AUTOGAIN, 0, 1, 1, 0);
|
||
|
|
@@ -1308,6 +1323,14 @@ static int ov5647_init_controls(struct o
|
||
|
|
if (sensor->vflip)
|
||
|
|
sensor->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
|
||
|
|
|
||
|
|
+ sensor->link_freq =
|
||
|
|
+ v4l2_ctrl_new_int_menu(&sensor->ctrls, &ov5647_ctrl_ops,
|
||
|
|
+ V4L2_CID_LINK_FREQ,
|
||
|
|
+ ARRAY_SIZE(ov5647_link_freqs) - 1, 0,
|
||
|
|
+ ov5647_link_freqs);
|
||
|
|
+ if (sensor->link_freq)
|
||
|
|
+ sensor->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
||
|
|
+
|
||
|
|
v4l2_fwnode_device_parse(dev, &props);
|
||
|
|
|
||
|
|
v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &ov5647_ctrl_ops,
|