From fa1d9aeccd9d3244d48ded2dc9e9405aab949513 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Wed, 29 Apr 2020 01:28:16 +0300 Subject: [PATCH] media: i2c: ov2311: add GMSL2 support This add GMSL2 camera with this imager Signed-off-by: Vladimir Barinov --- drivers/media/i2c/soc_camera/imagers/ov2311.c | 21 ++++++++++++++------- drivers/media/i2c/soc_camera/imagers/ov2311.h | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/media/i2c/soc_camera/imagers/ov2311.c b/drivers/media/i2c/soc_camera/imagers/ov2311.c index ce4999b..764c261 100644 --- a/drivers/media/i2c/soc_camera/imagers/ov2311.c +++ b/drivers/media/i2c/soc_camera/imagers/ov2311.c @@ -1,7 +1,7 @@ /* * OmniVision ov2311 sensor camera driver * - * Copyright (C) 2015-2019 Cogent Embedded, Inc. + * Copyright (C) 2015-2020 Cogent Embedded, Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -25,8 +25,8 @@ #define OV2311_I2C_ADDR 0x60 -#define OV2311_PID_REGA 0x300a -#define OV2311_PID_REGB 0x300b +#define OV2311_PIDA_REG 0x300a +#define OV2311_PIDB_REG 0x300b #define OV2311_REV_REG 0x300c #define OV2311_PID 0x2311 @@ -397,9 +397,9 @@ static int ov2311_initialize(struct i2c_client *client) setup_i2c_translator(client, priv->ser_addr, OV2311_I2C_ADDR, MODE_GMSL2); - reg16_read(client, OV2311_PID_REGA, &val); + reg16_read(client, OV2311_PIDA_REG, &val); pid = val; - reg16_read(client, OV2311_PID_REGB, &val); + reg16_read(client, OV2311_PIDB_REG, &val); pid = (pid << 8) | val; if (pid != OV2311_PID) { @@ -407,8 +407,15 @@ static int ov2311_initialize(struct i2c_client *client) return -ENODEV; } - if (get_des_id(client) == UB960_ID) - reg8_write_addr(client, priv->ser_addr, 0x02, 0x13); /* MIPI 2-lanes */ + switch (get_des_id(client)) { + case UB960_ID: + reg8_write_addr(client, priv->ser_addr, 0x02, 0x13); /* MIPI 2-lanes */ + break; + case MAX9296A_ID: + case MAX96712_ID: + reg16_write_addr(client, priv->ser_addr, MAX9295_MIPI_RX1, 0x11); /* MIPI 2-lanes */ + break; + } /* check revision */ reg16_read(client, OV2311_REV_REG, &rev); diff --git a/drivers/media/i2c/soc_camera/imagers/ov2311.h b/drivers/media/i2c/soc_camera/imagers/ov2311.h index 3a56b0b..f76662a 100644 --- a/drivers/media/i2c/soc_camera/imagers/ov2311.h +++ b/drivers/media/i2c/soc_camera/imagers/ov2311.h @@ -30,7 +30,7 @@ struct ov2311_reg { u8 val; }; -/* R1600x1300 RAW10 MIPI 60fps */ +/* R1600x1300 RAW8 MIPI 60fps */ static const struct ov2311_reg ov2311_regs_wizard_r1c[] = { {0x0103, 0x01}, {0x0100, 0x00}, -- 2.7.4