aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch307
1 files changed, 0 insertions, 307 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch b/target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch
deleted file mode 100644
index f74627962e..0000000000
--- a/target/linux/bcm27xx/patches-5.4/950-0821-media-i2c-imx290-Add-configurable-link-frequency-and.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From e3c6ec43e950d9e08715e2c693771080c7d078a3 Mon Sep 17 00:00:00 2001
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Date: Fri, 12 Jun 2020 15:53:50 +0200
-Subject: [PATCH] media: i2c: imx290: Add configurable link frequency
- and pixel rate
-
-Commit 98e0500eadb772e1be32d8e369fcc3b7bcac93ed upstream.
-
-IMX290 operates with multiple link frequency and pixel rate combinations.
-The initial driver used a single setting for both but since we now have
-the lane count support in place, let's add configurable link frequency
-and pixel rate.
-
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- drivers/media/i2c/imx290.c | 148 +++++++++++++++++++++++++++----------
- 1 file changed, 109 insertions(+), 39 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -32,8 +32,6 @@
- #define IMX290_PHY_LANE_NUM 0x3407
- #define IMX290_CSI_LANE_MODE 0x3443
-
--#define IMX290_DEFAULT_LINK_FREQ 445500000
--
- static const char * const imx290_supply_name[] = {
- "vdda",
- "vddd",
-@@ -51,8 +49,7 @@ struct imx290_mode {
- u32 width;
- u32 height;
- u32 hmax;
-- u32 pixel_rate;
-- u32 link_freq_index;
-+ u8 link_freq_index;
-
- const struct imx290_regval *data;
- u32 data_size;
-@@ -243,9 +240,36 @@ static const struct imx290_regval imx290
- };
-
- /* supported link frequencies */
--static const s64 imx290_link_freq[] = {
-- IMX290_DEFAULT_LINK_FREQ,
--};
-+#define FREQ_INDEX_1080P 0
-+#define FREQ_INDEX_720P 1
-+static const s64 imx290_link_freq_2lanes[] = {
-+ [FREQ_INDEX_1080P] = 445500000,
-+ [FREQ_INDEX_720P] = 297000000,
-+};
-+static const s64 imx290_link_freq_4lanes[] = {
-+ [FREQ_INDEX_1080P] = 222750000,
-+ [FREQ_INDEX_720P] = 148500000,
-+};
-+
-+/*
-+ * In this function and in the similar ones below We rely on imx290_probe()
-+ * to ensure that nlanes is either 2 or 4.
-+ */
-+static inline const s64 *imx290_link_freqs_ptr(const struct imx290 *imx290)
-+{
-+ if (imx290->nlanes == 2)
-+ return imx290_link_freq_2lanes;
-+ else
-+ return imx290_link_freq_4lanes;
-+}
-+
-+static inline int imx290_link_freqs_num(const struct imx290 *imx290)
-+{
-+ if (imx290->nlanes == 2)
-+ return ARRAY_SIZE(imx290_link_freq_2lanes);
-+ else
-+ return ARRAY_SIZE(imx290_link_freq_4lanes);
-+}
-
- /* Mode configs */
- static const struct imx290_mode imx290_modes_2lanes[] = {
-@@ -253,19 +277,17 @@ static const struct imx290_mode imx290_m
- .width = 1920,
- .height = 1080,
- .hmax = 0x1130,
-+ .link_freq_index = FREQ_INDEX_1080P,
- .data = imx290_1080p_settings,
- .data_size = ARRAY_SIZE(imx290_1080p_settings),
-- .pixel_rate = 178200000,
-- .link_freq_index = 0,
- },
- {
- .width = 1280,
- .height = 720,
- .hmax = 0x19c8,
-+ .link_freq_index = FREQ_INDEX_720P,
- .data = imx290_720p_settings,
- .data_size = ARRAY_SIZE(imx290_720p_settings),
-- .pixel_rate = 178200000,
-- .link_freq_index = 0,
- },
- };
-
-@@ -274,25 +296,22 @@ static const struct imx290_mode imx290_m
- .width = 1920,
- .height = 1080,
- .hmax = 0x0898,
-+ .link_freq_index = FREQ_INDEX_1080P,
- .data = imx290_1080p_settings,
- .data_size = ARRAY_SIZE(imx290_1080p_settings),
-- .pixel_rate = 178200000,
-- .link_freq_index = 0,
- },
- {
- .width = 1280,
- .height = 720,
- .hmax = 0x0ce4,
-+ .link_freq_index = FREQ_INDEX_720P,
- .data = imx290_720p_settings,
- .data_size = ARRAY_SIZE(imx290_720p_settings),
-- .pixel_rate = 178200000,
-- .link_freq_index = 0,
- },
- };
-
- static inline const struct imx290_mode *imx290_modes_ptr(const struct imx290 *imx290)
- {
-- /* We rely on imx290_probe() to ensure that nlanes is either 2 or 4 */
- if (imx290->nlanes == 2)
- return imx290_modes_2lanes;
- else
-@@ -477,6 +496,30 @@ static int imx290_get_fmt(struct v4l2_su
- return 0;
- }
-
-+static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
-+{
-+ return imx290->current_mode->link_freq_index;
-+}
-+
-+static s64 imx290_get_link_freq(struct imx290 *imx290)
-+{
-+ u8 index = imx290_get_link_freq_index(imx290);
-+
-+ return *(imx290_link_freqs_ptr(imx290) + index);
-+}
-+
-+static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
-+{
-+ s64 link_freq = imx290_get_link_freq(imx290);
-+ u8 nlanes = imx290->nlanes;
-+ u64 pixel_rate;
-+
-+ /* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-+ pixel_rate = link_freq * 2 * nlanes;
-+ do_div(pixel_rate, 10);
-+ return pixel_rate;
-+}
-+
- static int imx290_set_fmt(struct v4l2_subdev *sd,
- struct v4l2_subdev_pad_config *cfg,
- struct v4l2_subdev_format *fmt)
-@@ -509,10 +552,14 @@ static int imx290_set_fmt(struct v4l2_su
- format = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
- } else {
- format = &imx290->current_format;
-- __v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
-- __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate, mode->pixel_rate);
--
- imx290->current_mode = mode;
-+
-+ if (imx290->link_freq)
-+ __v4l2_ctrl_s_ctrl(imx290->link_freq,
-+ imx290_get_link_freq_index(imx290));
-+ if (imx290->pixel_rate)
-+ __v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
-+ imx290_calc_pixel_rate(imx290));
- }
-
- *format = fmt->format;
-@@ -536,12 +583,11 @@ static int imx290_entity_init_cfg(struct
- return 0;
- }
-
--static int imx290_write_current_format(struct imx290 *imx290,
-- struct v4l2_mbus_framefmt *format)
-+static int imx290_write_current_format(struct imx290 *imx290)
- {
- int ret;
-
-- switch (format->code) {
-+ switch (imx290->current_format.code) {
- case MEDIA_BUS_FMT_SRGGB10_1X10:
- ret = imx290_set_register_array(imx290, imx290_10bit_settings,
- ARRAY_SIZE(
-@@ -592,8 +638,8 @@ static int imx290_start_streaming(struct
- return ret;
- }
-
-- /* Set current frame format */
-- ret = imx290_write_current_format(imx290, &imx290->current_format);
-+ /* Apply the register values related to current frame format */
-+ ret = imx290_write_current_format(imx290);
- if (ret < 0) {
- dev_err(imx290->dev, "Could not set frame format\n");
- return ret;
-@@ -776,13 +822,34 @@ static const struct media_entity_operati
- .link_validate = v4l2_subdev_link_validate,
- };
-
-+/*
-+ * Returns 0 if all link frequencies used by the driver for the given number
-+ * of MIPI data lanes are mentioned in the device tree, or the value of the
-+ * first missing frequency otherwise.
-+ */
-+static s64 imx290_check_link_freqs(const struct imx290 *imx290)
-+{
-+ int i, j;
-+ const s64 *freqs = imx290_link_freqs_ptr(imx290);
-+ int freqs_count = imx290_link_freqs_num(imx290);
-+
-+ for (i = 0; i < freqs_count; i++) {
-+ for (j = 0; j < imx290->ep.nr_of_link_frequencies; j++)
-+ if (freqs[i] == imx290->ep.link_frequencies[j])
-+ break;
-+ if (j == imx290->ep.nr_of_link_frequencies)
-+ return freqs[i];
-+ }
-+ return 0;
-+}
-+
- static int imx290_probe(struct i2c_client *client)
- {
- struct device *dev = &client->dev;
- struct fwnode_handle *endpoint;
- struct imx290 *imx290;
- u32 xclk_freq;
-- u32 default_pixel_rate;
-+ s64 fq;
- int ret;
-
- imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL);
-@@ -825,8 +892,10 @@ static int imx290_probe(struct i2c_clien
- goto free_err;
- }
-
-- if (imx290->ep.link_frequencies[0] != IMX290_DEFAULT_LINK_FREQ) {
-- dev_err(dev, "Unsupported link frequency\n");
-+ /* Check that link frequences for all the modes are in device tree */
-+ fq = imx290_check_link_freqs(imx290);
-+ if (fq) {
-+ dev_err(dev, "Link frequency of %lld is not supported\n", fq);
- ret = -EINVAL;
- goto free_err;
- }
-@@ -883,26 +952,30 @@ static int imx290_probe(struct i2c_clien
-
- mutex_init(&imx290->lock);
-
-+ /*
-+ * Initialize the frame format. In particular, imx290->current_mode
-+ * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
-+ * below relies on these fields.
-+ */
-+ imx290_entity_init_cfg(&imx290->sd, NULL);
-+
- v4l2_ctrl_handler_init(&imx290->ctrls, 3);
-
- v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- V4L2_CID_GAIN, 0, 72, 1, 0);
-+
- imx290->link_freq =
-- v4l2_ctrl_new_int_menu(&imx290->ctrls,
-- &imx290_ctrl_ops,
-+ v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
- V4L2_CID_LINK_FREQ,
-- ARRAY_SIZE(imx290_link_freq) - 1,
-- 0, imx290_link_freq);
-+ imx290_link_freqs_num(imx290) - 1, 0,
-+ imx290_link_freqs_ptr(imx290));
- if (imx290->link_freq)
- imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-
-- default_pixel_rate = imx290->nlanes == 2 ?
-- imx290_modes_2lanes[0].pixel_rate :
-- imx290_modes_4lanes[0].pixel_rate;
- imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-- V4L2_CID_PIXEL_RATE, 1,
-- INT_MAX, 1,
-- default_pixel_rate);
-+ V4L2_CID_PIXEL_RATE,
-+ 1, INT_MAX, 1,
-+ imx290_calc_pixel_rate(imx290));
-
- imx290->sd.ctrl_handler = &imx290->ctrls;
-
-@@ -926,9 +999,6 @@ static int imx290_probe(struct i2c_clien
- goto free_ctrl;
- }
-
-- /* Initialize the frame format (this also sets imx290->current_mode) */
-- imx290_entity_init_cfg(&imx290->sd, NULL);
--
- ret = v4l2_async_register_subdev(&imx290->sd);
- if (ret < 0) {
- dev_err(dev, "Could not register v4l2 device\n");
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 16:46:10 +0000