From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
To: Dave Stevenson <dave.stevenson@raspberrypi.com>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>,
linux-media@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
devicetree@vger.kernel.org
Subject: Re: [PATCH 20/21] media: i2c: imx258: Change register settings for variants of the sensor
Date: Fri, 2 Jun 2023 15:48:21 +0200 [thread overview]
Message-ID: <zawd5acdiwtrve2k2n7p347uv767htvg73eq356darbdvnppqx@throy5wedcvx> (raw)
In-Reply-To: <20230530173000.3060865-21-dave.stevenson@raspberrypi.com>
Hi Dave
On Tue, May 30, 2023 at 06:29:59PM +0100, Dave Stevenson wrote:
> Sony have advised that there are variants of the IMX258 sensor which
> require slightly different register configuration to the mainline
> imx258 driver defaults.
>
> There is no available run-time detection for the variant, so add
> configuration via the DT compatible string.
>
> The Vision Components imx258 module supports PDAF, so add the
> register differences for that variant
>
> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> ---
> drivers/media/i2c/imx258.c | 49 ++++++++++++++++++++++++++++++++++----
> 1 file changed, 45 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
> index 986757650378..98b5c1e3abff 100644
> --- a/drivers/media/i2c/imx258.c
> +++ b/drivers/media/i2c/imx258.c
> @@ -6,6 +6,7 @@
> #include <linux/delay.h>
> #include <linux/i2c.h>
> #include <linux/module.h>
> +#include <linux/of_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/regulator/consumer.h>
> #include <media/v4l2-ctrls.h>
> @@ -320,8 +321,6 @@ static const struct imx258_reg mipi_642mbps_24mhz_4l[] = {
>
> static const struct imx258_reg mode_common_regs[] = {
> { 0x3051, 0x00 },
> - { 0x3052, 0x00 },
> - { 0x4E21, 0x14 },
> { 0x6B11, 0xCF },
> { 0x7FF0, 0x08 },
> { 0x7FF1, 0x0F },
> @@ -344,7 +343,6 @@ static const struct imx258_reg mode_common_regs[] = {
> { 0x7FA8, 0x03 },
> { 0x7FA9, 0xFE },
> { 0x7B24, 0x81 },
> - { 0x7B25, 0x00 },
> { 0x6564, 0x07 },
> { 0x6B0D, 0x41 },
> { 0x653D, 0x04 },
> @@ -459,6 +457,33 @@ static const struct imx258_reg mode_1048_780_regs[] = {
> { 0x034F, 0x0C },
> };
>
> +struct imx258_variant_cfg {
> + const struct imx258_reg *regs;
> + unsigned int num_regs;
> +};
> +
> +static const struct imx258_reg imx258_cfg_regs[] = {
> + { 0x3052, 0x00 },
> + { 0x4E21, 0x14 },
> + { 0x7B25, 0x00 },
> +};
> +
> +static const struct imx258_variant_cfg imx258_cfg = {
> + .regs = imx258_cfg_regs,
> + .num_regs = ARRAY_SIZE(imx258_cfg_regs),
> +};
> +
> +static const struct imx258_reg imx258_pdaf_cfg_regs[] = {
> + { 0x3052, 0x01 },
> + { 0x4E21, 0x10 },
> + { 0x7B25, 0x01 },
> +};
> +
> +static const struct imx258_variant_cfg imx258_pdaf_cfg = {
> + .regs = imx258_pdaf_cfg_regs,
> + .num_regs = ARRAY_SIZE(imx258_pdaf_cfg_regs),
> +};
> +
> static const char * const imx258_test_pattern_menu[] = {
> "Disabled",
> "Solid Colour",
> @@ -643,6 +668,8 @@ struct imx258 {
> struct v4l2_subdev sd;
> struct media_pad pad;
>
> + const struct imx258_variant_cfg *variant_cfg;
> +
> struct v4l2_ctrl_handler ctrl_handler;
> /* V4L2 Controls */
> struct v4l2_ctrl *link_freq;
> @@ -1134,6 +1161,14 @@ static int imx258_start_streaming(struct imx258 *imx258)
> return ret;
> }
>
> + ret = imx258_write_regs(imx258, imx258->variant_cfg->regs,
> + imx258->variant_cfg->num_regs);
> + if (ret) {
> + dev_err(&client->dev, "%s failed to set variant config\n",
> + __func__);
> + return ret;
> + }
> +
> ret = imx258_write_reg(imx258, IMX258_CLK_BLANK_STOP,
> IMX258_REG_VALUE_08BIT,
> imx258->csi2_flags & V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK ?
> @@ -1490,6 +1525,7 @@ static int imx258_probe(struct i2c_client *client)
> struct v4l2_fwnode_endpoint ep = {
> .bus_type = V4L2_MBUS_CSI2_DPHY
> };
> + const struct of_device_id *match;
This seems to be unused
> int ret;
> u32 val = 0;
>
> @@ -1565,6 +1601,10 @@ static int imx258_probe(struct i2c_client *client)
>
> imx258->csi2_flags = ep.bus.mipi_csi2.flags;
>
> + imx258->variant_cfg = of_device_get_match_data(&client->dev);
> + if (!match)
Here you could check for !imx258->variant_cfg
> + imx258->variant_cfg = &imx258_cfg;
> +
> /* Initialize subdev */
> v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops);
>
> @@ -1653,7 +1693,8 @@ MODULE_DEVICE_TABLE(acpi, imx258_acpi_ids);
> #endif
>
> static const struct of_device_id imx258_dt_ids[] = {
> - { .compatible = "sony,imx258" },
> + { .compatible = "sony,imx258", .data = &imx258_cfg },
> + { .compatible = "sony,imx258-pdaf", .data = &imx258_pdaf_cfg },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, imx258_dt_ids);
> --
> 2.25.1
>
next prev parent reply other threads:[~2023-06-02 13:48 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 17:29 [PATCH 00/21] imx258 improvements series Dave Stevenson
2023-05-30 17:29 ` [PATCH 01/21] media: i2c: imx258: Remove unused defines Dave Stevenson
2023-05-31 15:08 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 02/21] media: i2c: imx258: Make image geometry meet sensor requirements Dave Stevenson
2023-05-31 15:09 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 03/21] media: i2c: imx258: Disable digital cropping on binned modes Dave Stevenson
2023-05-31 15:02 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 04/21] media: i2c: imx258: Remove redundant I2C writes Dave Stevenson
2023-05-31 15:10 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 05/21] media: i2c: imx258: Add regulator control Dave Stevenson
2023-05-31 15:11 ` Jacopo Mondi
2023-05-31 15:26 ` Dave Stevenson
2023-05-30 17:29 ` [PATCH 06/21] media: i2c: imx258: Make V4L2_CID_VBLANK configurable Dave Stevenson
2023-05-31 15:16 ` Jacopo Mondi
2023-05-31 15:33 ` Dave Stevenson
2023-05-30 17:29 ` [PATCH 07/21] media: i2c: imx258: Split out common registers from the mode based ones Dave Stevenson
2023-05-31 15:26 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 08/21] media: i2c: imx258: Add support for 24MHz clock Dave Stevenson
2023-06-02 12:59 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 09/21] media: i2c: imx258: Add support for running on 2 CSI data lanes Dave Stevenson
2023-05-30 17:37 ` Dave Stevenson
2023-05-31 8:07 ` kernel test robot
2023-06-02 13:23 ` Jacopo Mondi
2023-06-02 17:46 ` Dave Stevenson
2023-05-30 17:29 ` [PATCH 10/21] media: i2c: imx258: Follow normal V4L2 behaviours for clipping exposure Dave Stevenson
2023-05-31 15:27 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 11/21] media: i2c: imx258: Add get_selection for pixel array information Dave Stevenson
2023-06-02 13:24 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 12/21] media: i2c: imx258: Allow configuration of clock lane behaviour Dave Stevenson
2023-06-02 13:26 ` Jacopo Mondi
2023-06-02 15:18 ` Dave Stevenson
2023-05-30 17:29 ` [PATCH 13/21] media: i2c: imx258: Correct max FRM_LENGTH_LINES value Dave Stevenson
2023-06-02 13:33 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 14/21] media: i2c: imx258: Add support for long exposure modes Dave Stevenson
2023-06-02 13:38 ` Jacopo Mondi
2023-06-02 17:12 ` Dave Stevenson
2023-05-30 17:29 ` [PATCH 15/21] media: i2c: imx258: Issue reset before starting streaming Dave Stevenson
2023-06-02 13:42 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 16/21] media: i2c: imx258: Set pixel_rate range to the same as the value Dave Stevenson
2023-06-02 13:44 ` Jacopo Mondi
2023-05-30 17:29 ` [PATCH 17/21] media: i2c: imx258: Support faster pixel rate on binned modes Dave Stevenson
2023-05-30 17:29 ` [PATCH 18/21] dt-bindings: media: imx258: Rename to include vendor prefix Dave Stevenson
2023-05-30 17:35 ` Conor Dooley
2023-05-30 17:29 ` [PATCH 19/21] dt-bindings: media: imx258: Add alternate compatible strings Dave Stevenson
2023-05-30 17:38 ` Conor Dooley
2023-05-30 17:48 ` Dave Stevenson
2023-05-30 19:36 ` Conor Dooley
2023-05-30 17:29 ` [PATCH 20/21] media: i2c: imx258: Change register settings for variants of the sensor Dave Stevenson
2023-06-02 13:48 ` Jacopo Mondi [this message]
2023-06-02 14:30 ` Dave Stevenson
2023-05-30 17:30 ` [PATCH 21/21] media: i2c: imx258: Make HFLIP and VFLIP controls writable Dave Stevenson
2023-06-02 13:58 ` Jacopo Mondi
2023-06-02 14:42 ` Dave Stevenson
2023-07-18 12:08 ` [PATCH 00/21] imx258 improvements series Arnaud Ferraris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=zawd5acdiwtrve2k2n7p347uv767htvg73eq356darbdvnppqx@throy5wedcvx \
--to=jacopo.mondi@ideasonboard.com \
--cc=conor+dt@kernel.org \
--cc=dave.stevenson@raspberrypi.com \
--cc=devicetree@vger.kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).