media: i2c: imx258: Change register settings for variants of the sensor

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>

diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
index f41116b..c8e6b7b 100644 (file)
--- a/drivers/media/i2c/imx258.c
+++ b/drivers/media/i2c/imx258.c
@@ -320,8 +320,6 @@ static const struct imx258_reg mipi_642mbps_24mhz_4l[] = {
 
 static const struct imx258_reg mode_4208x3120_regs[] = {
        { 0x3051, 0x00 },
-       { 0x3052, 0x00 },
-       { 0x4E21, 0x14 },
        { 0x6B11, 0xCF },
        { 0x7FF0, 0x08 },
        { 0x7FF1, 0x0F },
@@ -344,7 +342,6 @@ static const struct imx258_reg mode_4208x3120_regs[] = {
        { 0x7FA8, 0x03 },
        { 0x7FA9, 0xFE },
        { 0x7B24, 0x81 },
-       { 0x7B25, 0x00 },
        { 0x6564, 0x07 },
        { 0x6B0D, 0x41 },
        { 0x653D, 0x04 },
@@ -432,8 +429,6 @@ static const struct imx258_reg mode_4208x3120_regs[] = {
 
 static const struct imx258_reg mode_2104_1560_regs[] = {
        { 0x3051, 0x00 },
-       { 0x3052, 0x00 },
-       { 0x4E21, 0x14 },
        { 0x6B11, 0xCF },
        { 0x7FF0, 0x08 },
        { 0x7FF1, 0x0F },
@@ -456,7 +451,6 @@ static const struct imx258_reg mode_2104_1560_regs[] = {
        { 0x7FA8, 0x03 },
        { 0x7FA9, 0xFE },
        { 0x7B24, 0x81 },
-       { 0x7B25, 0x00 },
        { 0x6564, 0x07 },
        { 0x6B0D, 0x41 },
        { 0x653D, 0x04 },
@@ -544,8 +538,6 @@ static const struct imx258_reg mode_2104_1560_regs[] = {
 
 static const struct imx258_reg mode_1048_780_regs[] = {
        { 0x3051, 0x00 },
-       { 0x3052, 0x00 },
-       { 0x4E21, 0x14 },
        { 0x6B11, 0xCF },
        { 0x7FF0, 0x08 },
        { 0x7FF1, 0x0F },
@@ -568,7 +560,6 @@ static const struct imx258_reg mode_1048_780_regs[] = {
        { 0x7FA8, 0x03 },
        { 0x7FA9, 0xFE },
        { 0x7B24, 0x81 },
-       { 0x7B25, 0x00 },
        { 0x6564, 0x07 },
        { 0x6B0D, 0x41 },
        { 0x653D, 0x04 },
@@ -654,6 +645,33 @@ static const struct imx258_reg mode_1048_780_regs[] = {
        { 0x0220, 0x00 },
 };
 
+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",
@@ -838,6 +856,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;
@@ -1322,6 +1342,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 ?
@@ -1671,6 +1699,12 @@ static int imx258_get_regulators(struct imx258 *imx258,
                                       imx258->supplies);
 }
 
+static const struct of_device_id imx258_dt_ids[] = {
+       { .compatible = "sony,imx258", .data = &imx258_cfg },
+       { .compatible = "sony,imx258-pdaf", .data = &imx258_pdaf_cfg },
+       { /* sentinel */ }
+};
+
 static int imx258_probe(struct i2c_client *client)
 {
        struct imx258 *imx258;
@@ -1678,6 +1712,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;
        int ret;
        u32 val = 0;
 
@@ -1753,6 +1788,13 @@ static int imx258_probe(struct i2c_client *client)
 
        imx258->csi2_flags = ep.bus.mipi_csi2.flags;
 
+       match = i2c_of_match_device(imx258_dt_ids, client);
+       if (!match || !match->data)
+               imx258->variant_cfg = &imx258_cfg;
+       else
+               imx258->variant_cfg =
+                       (const struct imx258_variant_cfg *)match->data;
+
        /* Initialize subdev */
        v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops);
 
@@ -1839,10 +1881,6 @@ static const struct acpi_device_id imx258_acpi_ids[] = {
 MODULE_DEVICE_TABLE(acpi, imx258_acpi_ids);
 #endif
 
-static const struct of_device_id imx258_dt_ids[] = {
-       { .compatible = "sony,imx258" },
-       { /* sentinel */ }
-};
 MODULE_DEVICE_TABLE(of, imx258_dt_ids);
 
 static struct i2c_driver imx258_i2c_driver = {