:p
atchew
Login
Add OmniVision OG0VA1B driver support. The OmniVision OG0VA1B is a 1/10-inch monochrome CMOS VGA image sensor. It outputs 10-bit raw (Y10) frames at up to 640x480 resolution over a single-lane MIPI CSI-2 interface and is controlled via an I2C-compatible SCCB bus. This driver has been verified on the Purwa EVK. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- Wenmeng Liu (2): dt-bindings: media: i2c: Add OmniVision OG0VA1B media: i2c: og0va1b: Add OmniVision OG0VA1B camera sensor .../bindings/media/i2c/ovti,og0va1b.yaml | 104 +++ MAINTAINERS | 7 + drivers/media/i2c/Kconfig | 10 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/og0va1b.c | 867 +++++++++++++++++++++ 5 files changed, 989 insertions(+) --- base-commit: 4fa3f5fabb30bf00d7475d5a33459ea83d639bf9 change-id: 20260618-og0va1b-55bbf3cabb0e Best regards, -- Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
Add devicetree binding for OmniVision OG0VA1B image sensor. OmniVision OG0VA1B is an image sensor, which produces frames in 10-bit raw output format (Y10) over a 1-lane MIPI CSI-2 interface and supports the 640x480 (VGA) resolution. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- .../bindings/media/i2c/ovti,og0va1b.yaml | 104 +++++++++++++++++++++ MAINTAINERS | 6 ++ 2 files changed, 110 insertions(+) diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,og0va1b.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,og0va1b.yaml new file mode 100644 index XXXXXXX..XXXXXXX --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/ovti,og0va1b.yaml @@ -XXX,XX +XXX,XX @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/i2c/ovti,og0va1b.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: OmniVision OG0VA1B Image Sensor + +maintainers: + - Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> + +description: + The OmniVision OG0VA1B is a 1/10-inch black and white CMOS VGA (640x480) + image sensor. It is controlled over an I2C-compatible SCCB bus and transmits + images on a 1-lane MIPI CSI-2 output interface. + +allOf: + - $ref: /schemas/media/video-interface-devices.yaml# + +properties: + compatible: + const: ovti,og0va1b + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + reset-gpios: + description: Active low GPIO connected to XSHUTDN pad of the sensor. + maxItems: 1 + + avdd-supply: + description: Analogue circuit voltage supply. + + dovdd-supply: + description: I/O circuit voltage supply. + + dvdd-supply: + description: Digital circuit voltage supply. + + port: + $ref: /schemas/graph.yaml#/$defs/port-base + additionalProperties: false + description: + Output port node, single endpoint describing the CSI-2 transmitter. + + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + + properties: + data-lanes: + description: OG0VA1B supports a single MIPI CSI-2 data lane only. + items: + - const: 1 + + link-frequencies: true + + required: + - data-lanes + - link-frequencies + + required: + - endpoint + +required: + - compatible + - reg + - clocks + - port + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + sensor@36 { + compatible = "ovti,og0va1b"; + reg = <0x36>; + clocks = <&clk 0>; + reset-gpios = <&gpio 42 GPIO_ACTIVE_LOW>; + avdd-supply = <&vreg_2v8>; + dovdd-supply = <&vreg_1v8>; + dvdd-supply = <&vreg_1v2>; + + port { + og0va1b_ep: endpoint { + remote-endpoint = <&csiphy_ep>; + data-lanes = <1>; + link-frequencies = /bits/ 64 <480000000>; + }; + }; + }; + }; +... diff --git a/MAINTAINERS b/MAINTAINERS index XXXXXXX..XXXXXXX 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -XXX,XX +XXX,XX @@ S: Maintained F: Documentation/devicetree/bindings/media/i2c/ovti,og01a1b.yaml F: drivers/media/i2c/og01a1b.c +OMNIVISION OG0VA1B SENSOR DRIVER +M: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> +L: linux-media@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/media/i2c/ovti,og0va1b.yaml + OMNIVISION OG0VE1B SENSOR DRIVER M: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> L: linux-media@vger.kernel.org -- 2.34.1
Add V4L2 sub device driver for OmniVision OG0VA1B image sensor. OmniVision OG0VA1B is an image sensor, which produces frames in 10-bit raw output format (Y10) over a 1-lane MIPI CSI-2 interface and supports the 640x480 (VGA) resolution. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- MAINTAINERS | 1 + drivers/media/i2c/Kconfig | 10 + drivers/media/i2c/Makefile | 1 + drivers/media/i2c/og0va1b.c | 867 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 879 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index XXXXXXX..XXXXXXX 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -XXX,XX +XXX,XX @@ M: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/i2c/ovti,og0va1b.yaml +F: drivers/media/i2c/og0va1b.c OMNIVISION OG0VE1B SENSOR DRIVER M: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index XXXXXXX..XXXXXXX 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -XXX,XX +XXX,XX @@ config VIDEO_OG01A1B To compile this driver as a module, choose M here: the module will be called og01a1b. +config VIDEO_OG0VA1B + tristate "OmniVision OG0VA1B sensor support" + select V4L2_CCI_I2C + help + This is a Video4Linux2 sensor driver for the OmniVision + OG0VA1B camera. + + To compile this driver as a module, choose M here: the + module will be called og0va1b. + config VIDEO_OG0VE1B tristate "OmniVision OG0VE1B sensor support" select V4L2_CCI_I2C diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index XXXXXXX..XXXXXXX 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -XXX,XX +XXX,XX @@ obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o obj-$(CONFIG_VIDEO_MT9V111) += mt9v111.o obj-$(CONFIG_VIDEO_OG01A1B) += og01a1b.o +obj-$(CONFIG_VIDEO_OG0VA1B) += og0va1b.o obj-$(CONFIG_VIDEO_OG0VE1B) += og0ve1b.o obj-$(CONFIG_VIDEO_OS05B10) += os05b10.o obj-$(CONFIG_VIDEO_OV01A10) += ov01a10.o diff --git a/drivers/media/i2c/og0va1b.c b/drivers/media/i2c/og0va1b.c new file mode 100644 index XXXXXXX..XXXXXXX --- /dev/null +++ b/drivers/media/i2c/og0va1b.c @@ -XXX,XX +XXX,XX @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * OmniVision OG0VA1B Camera Sensor Driver + * + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries + */ + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/i2c.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/pm_runtime.h> +#include <linux/regulator/consumer.h> + +#include <media/v4l2-cci.h> +#include <media/v4l2-ctrls.h> +#include <media/v4l2-device.h> +#include <media/v4l2-fwnode.h> +#include <media/v4l2-subdev.h> + +#define OG0VA1B_REG_CHIP_ID CCI_REG16(0x300a) +#define OG0VA1B_CHIP_ID 0xC756 + +#define OG0VA1B_REG_SW_RESET CCI_REG8(0x103) +#define OG0VA1B_SW_RESET BIT(0) + +#define OG0VA1B_REG_STREAMING CCI_REG8(0x100) +#define OG0VA1B_STREAMING_ON BIT(0) + +/* Exposure: 16-bit coarse integration time at 0x3501/0x3502 */ +#define OG0VA1B_REG_EXPOSURE CCI_REG16(0x3501) +#define OG0VA1B_EXPOSURE_MIN 1 +#define OG0VA1B_EXPOSURE_STEP 1 +#define OG0VA1B_EXPOSURE_DEFAULT 0x100 + +#define OG0VA1B_REG_GAIN_H CCI_REG8(0x3508) +#define OG0VA1B_REG_GAIN_L CCI_REG8(0x3509) +#define OG0VA1B_GAIN_MIN 0x10 +#define OG0VA1B_GAIN_MAX 0x1ff +#define OG0VA1B_GAIN_STEP 1 +#define OG0VA1B_GAIN_DEFAULT 0x10 + +#define OG0VA1B_REG_VTS CCI_REG16(0x380e) + +/* Test pattern: register 0x5100, BIT(7) = enable, BIT[3:2] = bar style */ +#define OG0VA1B_REG_TEST_PATTERN CCI_REG8(0x5100) +#define OG0VA1B_TEST_PATTERN_EN BIT(7) +#define OG0VA1B_TEST_PATTERN_BAR_SHIFT 2 + +#define OG0VA1B_EXPOSURE_MARGIN 14 +#define OG0VA1B_VBLANK_MIN OG0VA1B_EXPOSURE_MARGIN + +#define OG0VA1B_XVCLK_RATE 19200000UL + +#define OG0VA1B_AUTOSUSPEND_DELAY_MS 1000 + +static const s64 og0va1b_link_freqs[] = { + 480000000, +}; + +#define OG0VA1B_PIXEL_RATE 48000000UL +#define OG0VA1B_LINK_FREQ_INDEX 0 + +#define OG0VA1B_DATA_LANES 1 + +static const char * const og0va1b_supply_names[] = { + "avdd", /* VANA */ + "dovdd", /* VIO */ + "dvdd", /* VDIG */ +}; + +#define OG0VA1B_NUM_SUPPLIES ARRAY_SIZE(og0va1b_supply_names) + +struct og0va1b_mode { + u32 width; + u32 height; + u32 hts; + u32 vts; + u32 num_regs; + const struct cci_reg_sequence *regs; +}; + +/* VGA 640x480 @ 60 fps */ +static const struct cci_reg_sequence og0va1b_vga_60fps_regs[] = { + { CCI_REG8(0x0302), 0x31 }, + { CCI_REG8(0x0303), 0x02 }, + { CCI_REG8(0x0304), 0x01 }, + { CCI_REG8(0x0305), 0x90 }, + { CCI_REG8(0x0306), 0x00 }, + { CCI_REG8(0x0323), 0x02 }, + { CCI_REG8(0x0325), 0x68 }, + { CCI_REG8(0x0326), 0xd8 }, + { CCI_REG8(0x3006), 0x0e }, + { CCI_REG8(0x300d), 0x08 }, + { CCI_REG8(0x3018), 0xf0 }, + { CCI_REG8(0x301c), 0xf0 }, + { CCI_REG8(0x3020), 0x20 }, + { CCI_REG8(0x3022), 0x01 }, + { CCI_REG8(0x3040), 0x0f }, + { CCI_REG8(0x3107), 0x40 }, + { CCI_REG8(0x3216), 0x01 }, + { CCI_REG8(0x3217), 0x00 }, + { CCI_REG8(0x3218), 0xc0 }, + { CCI_REG8(0x3219), 0x55 }, + { CCI_REG8(0x3500), 0x00 }, + { CCI_REG8(0x3501), 0x00 }, + { CCI_REG8(0x3502), 0x01 }, + { CCI_REG8(0x3506), 0x01 }, + { CCI_REG8(0x3507), 0x50 }, + { CCI_REG8(0x3508), 0x01 }, + { CCI_REG8(0x3509), 0x00 }, + { CCI_REG8(0x350a), 0x01 }, + { CCI_REG8(0x350b), 0x00 }, + { CCI_REG8(0x350c), 0x00 }, + { CCI_REG8(0x3541), 0x00 }, + { CCI_REG8(0x3542), 0x40 }, + { CCI_REG8(0x3605), 0x90 }, + { CCI_REG8(0x3606), 0x41 }, + { CCI_REG8(0x3612), 0x00 }, + { CCI_REG8(0x3620), 0x08 }, + { CCI_REG8(0x3630), 0x17 }, + { CCI_REG8(0x3631), 0x99 }, + { CCI_REG8(0x3639), 0x88 }, + { CCI_REG8(0x3668), 0x00 }, + { CCI_REG8(0x3674), 0x00 }, + { CCI_REG8(0x3677), 0x3f }, + { CCI_REG8(0x368f), 0x06 }, + { CCI_REG8(0x36a2), 0x19 }, + { CCI_REG8(0x36a4), 0xf1 }, + { CCI_REG8(0x36a5), 0x2d }, + { CCI_REG8(0x3706), 0x30 }, + { CCI_REG8(0x370d), 0x72 }, + { CCI_REG8(0x3713), 0x86 }, + { CCI_REG8(0x3715), 0x03 }, + { CCI_REG8(0x3716), 0x00 }, + { CCI_REG8(0x376d), 0x24 }, + { CCI_REG8(0x3770), 0x3a }, + { CCI_REG8(0x3778), 0x00 }, + { CCI_REG8(0x37a8), 0x03 }, + { CCI_REG8(0x37a9), 0x00 }, + { CCI_REG8(0x37df), 0x7d }, + { CCI_REG8(0x3800), 0x00 }, + { CCI_REG8(0x3801), 0x00 }, + { CCI_REG8(0x3802), 0x00 }, + { CCI_REG8(0x3803), 0x00 }, + { CCI_REG8(0x3804), 0x02 }, + { CCI_REG8(0x3805), 0x8f }, + { CCI_REG8(0x3806), 0x01 }, + { CCI_REG8(0x3807), 0xef }, + { CCI_REG8(0x3808), 0x02 }, + { CCI_REG8(0x3809), 0x80 }, + { CCI_REG8(0x380a), 0x01 }, + { CCI_REG8(0x380b), 0xe0 }, + { CCI_REG8(0x380c), 0x01 }, + { CCI_REG8(0x380d), 0x78 }, + { CCI_REG8(0x380e), 0x08 }, + { CCI_REG8(0x380f), 0x30 }, + { CCI_REG8(0x3810), 0x00 }, + { CCI_REG8(0x3811), 0x08 }, + { CCI_REG8(0x3812), 0x00 }, + { CCI_REG8(0x3813), 0x08 }, + { CCI_REG8(0x3814), 0x11 }, + { CCI_REG8(0x3815), 0x11 }, + { CCI_REG8(0x3816), 0x00 }, + { CCI_REG8(0x3817), 0x01 }, + { CCI_REG8(0x3818), 0x00 }, + { CCI_REG8(0x3819), 0x05 }, + { CCI_REG8(0x3820), 0x40 }, + { CCI_REG8(0x3821), 0x04 }, + { CCI_REG8(0x3823), 0x00 }, + { CCI_REG8(0x3826), 0x00 }, + { CCI_REG8(0x3827), 0x00 }, + { CCI_REG8(0x382b), 0x52 }, + { CCI_REG8(0x384a), 0xa2 }, + { CCI_REG8(0x3858), 0x00 }, + { CCI_REG8(0x3859), 0x00 }, + { CCI_REG8(0x3860), 0x00 }, + { CCI_REG8(0x3861), 0x00 }, + { CCI_REG8(0x3866), 0x0c }, + { CCI_REG8(0x3867), 0x07 }, + { CCI_REG8(0x3884), 0x00 }, + { CCI_REG8(0x3885), 0x08 }, + { CCI_REG8(0x3888), 0x50 }, + { CCI_REG8(0x3893), 0x6c }, + { CCI_REG8(0x3898), 0x00 }, + { CCI_REG8(0x389a), 0x04 }, + { CCI_REG8(0x389b), 0x01 }, + { CCI_REG8(0x389c), 0x0b }, + { CCI_REG8(0x389d), 0xdc }, + { CCI_REG8(0x389f), 0x08 }, + { CCI_REG8(0x38a0), 0x00 }, + { CCI_REG8(0x38a1), 0x00 }, + { CCI_REG8(0x38b1), 0x04 }, + { CCI_REG8(0x38b2), 0x00 }, + { CCI_REG8(0x38b3), 0x08 }, + { CCI_REG8(0x38c1), 0x46 }, + { CCI_REG8(0x38c9), 0x02 }, + { CCI_REG8(0x38d4), 0x06 }, + { CCI_REG8(0x38d5), 0x5a }, + { CCI_REG8(0x38d6), 0x08 }, + { CCI_REG8(0x38d7), 0x3a }, + { CCI_REG8(0x391e), 0x01 }, + { CCI_REG8(0x391f), 0x00 }, + { CCI_REG8(0x3920), 0xaa }, + { CCI_REG8(0x3921), 0x00 }, + { CCI_REG8(0x3922), 0x00 }, + { CCI_REG8(0x3923), 0x00 }, + { CCI_REG8(0x3924), 0x00 }, + { CCI_REG8(0x3925), 0x00 }, + { CCI_REG8(0x3926), 0x00 }, + { CCI_REG8(0x3927), 0x00 }, + { CCI_REG8(0x3928), 0x10 }, + { CCI_REG8(0x3929), 0x01 }, + { CCI_REG8(0x392a), 0xb4 }, + { CCI_REG8(0x392b), 0x00 }, + { CCI_REG8(0x392c), 0x10 }, + { CCI_REG8(0x392d), 0x01 }, + { CCI_REG8(0x392e), 0x78 }, + { CCI_REG8(0x392f), 0x4a }, + { CCI_REG8(0x3a06), 0x06 }, + { CCI_REG8(0x3a07), 0x78 }, + { CCI_REG8(0x3a08), 0x08 }, + { CCI_REG8(0x3a09), 0x80 }, + { CCI_REG8(0x3a52), 0x00 }, + { CCI_REG8(0x3a53), 0x01 }, + { CCI_REG8(0x3a54), 0x0c }, + { CCI_REG8(0x3a55), 0x04 }, + { CCI_REG8(0x3a58), 0x0c }, + { CCI_REG8(0x3a59), 0x04 }, + { CCI_REG8(0x4000), 0xcf }, + { CCI_REG8(0x4003), 0x40 }, + { CCI_REG8(0x4008), 0x04 }, + { CCI_REG8(0x4009), 0x13 }, + { CCI_REG8(0x400a), 0x02 }, + { CCI_REG8(0x400b), 0x34 }, + { CCI_REG8(0x4010), 0x71 }, + { CCI_REG8(0x4042), 0xc3 }, + { CCI_REG8(0x4306), 0x04 }, + { CCI_REG8(0x4307), 0x12 }, + { CCI_REG8(0x4500), 0x70 }, + { CCI_REG8(0x4509), 0x00 }, + { CCI_REG8(0x450b), 0x83 }, + { CCI_REG8(0x4604), 0x68 }, + { CCI_REG8(0x4f00), 0x04 }, + { CCI_REG8(0x4f10), 0x04 }, + { CCI_REG8(0x4f21), 0x01 }, + { CCI_REG8(0x4f22), 0x00 }, + { CCI_REG8(0x4f23), 0x54 }, + { CCI_REG8(0x4f24), 0x51 }, + { CCI_REG8(0x4f25), 0x41 }, + { CCI_REG8(0x5000), 0x3f }, + { CCI_REG8(0x5001), 0x80 }, + { CCI_REG8(0x500a), 0x00 }, + { CCI_REG8(0x5100), 0x00 }, + { CCI_REG8(0x5111), 0x20 }, + { CCI_REG8(0x481b), 0x44 }, + { CCI_REG8(0x481f), 0x30 }, + { CCI_REG8(0x4823), 0x44 }, + { CCI_REG8(0x4825), 0x35 }, + { CCI_REG8(0x4837), 0x11 }, +}; + +static const struct og0va1b_mode og0va1b_modes[] = { + { + .width = 640, + .height = 480, + .hts = 376, + .vts = 2096, + .num_regs = ARRAY_SIZE(og0va1b_vga_60fps_regs), + .regs = og0va1b_vga_60fps_regs, + }, +}; + +struct og0va1b { + struct v4l2_subdev sd; + struct media_pad pad; + struct regmap *regmap; + struct clk *inclk; + struct gpio_desc *reset_gpio; + struct regulator_bulk_data supplies[OG0VA1B_NUM_SUPPLIES]; + + struct v4l2_ctrl_handler ctrl_handler; + struct v4l2_ctrl *link_freq; + struct v4l2_ctrl *pixel_rate; + struct v4l2_ctrl *vblank; + struct v4l2_ctrl *hblank; + struct v4l2_ctrl *exposure; + struct v4l2_ctrl *gain; + struct v4l2_ctrl *test_pattern; +}; + +static inline struct og0va1b *sd_to_og0va1b(struct v4l2_subdev *sd) +{ + return container_of(sd, struct og0va1b, sd); +} + +static int og0va1b_power_on(struct device *dev) +{ + struct v4l2_subdev *sd = dev_get_drvdata(dev); + struct og0va1b *og0va1b = sd_to_og0va1b(sd); + int ret; + + ret = regulator_bulk_enable(OG0VA1B_NUM_SUPPLIES, og0va1b->supplies); + if (ret) { + dev_err(dev, "failed to enable regulators: %d\n", ret); + return ret; + } + + ret = clk_prepare_enable(og0va1b->inclk); + if (ret) { + dev_err(dev, "failed to enable clock: %d\n", ret); + goto err_regulators; + } + + gpiod_set_value_cansleep(og0va1b->reset_gpio, 0); + + usleep_range(18000, 20000); + + return 0; + +err_regulators: + regulator_bulk_disable(OG0VA1B_NUM_SUPPLIES, og0va1b->supplies); + return ret; +} + +static int og0va1b_power_off(struct device *dev) +{ + struct v4l2_subdev *sd = dev_get_drvdata(dev); + struct og0va1b *og0va1b = sd_to_og0va1b(sd); + + clk_disable_unprepare(og0va1b->inclk); + gpiod_set_value_cansleep(og0va1b->reset_gpio, 1); + regulator_bulk_disable(OG0VA1B_NUM_SUPPLIES, og0va1b->supplies); + + return 0; +} + +static int og0va1b_check_id(struct og0va1b *og0va1b) +{ + struct device *dev = og0va1b->sd.dev; + u64 chip_id; + int ret; + + ret = cci_read(og0va1b->regmap, OG0VA1B_REG_CHIP_ID, &chip_id, NULL); + if (ret) + return dev_err_probe(dev, ret, "failed to read chip ID\n"); + + if (chip_id != OG0VA1B_CHIP_ID) + return dev_err_probe(dev, -ENODEV, + "unexpected chip ID 0x%04llx (expected 0x%04x)\n", + chip_id, OG0VA1B_CHIP_ID); + + return 0; +} + +static int og0va1b_check_hwcfg(struct device *dev) +{ + struct fwnode_handle *fwnode = dev_fwnode(dev); + struct v4l2_fwnode_endpoint bus_cfg = { + .bus_type = V4L2_MBUS_CSI2_DPHY, + }; + struct fwnode_handle *ep; + unsigned int i; + int ret; + + if (!fwnode) + return -ENXIO; + + ep = fwnode_graph_get_next_endpoint(fwnode, NULL); + if (!ep) + return dev_err_probe(dev, -ENXIO, "no endpoint found\n"); + + ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg); + fwnode_handle_put(ep); + if (ret) + return dev_err_probe(dev, ret, "failed to parse endpoint\n"); + + if (bus_cfg.bus.mipi_csi2.num_data_lanes != OG0VA1B_DATA_LANES) { + ret = dev_err_probe(dev, -EINVAL, + "unsupported number of CSI2 data lanes %u\n", + bus_cfg.bus.mipi_csi2.num_data_lanes); + goto err_free; + } + + if (!bus_cfg.nr_of_link_frequencies) { + ret = dev_err_probe(dev, -EINVAL, + "no link frequencies defined\n"); + goto err_free; + } + + for (i = 0; i < bus_cfg.nr_of_link_frequencies; i++) + if (bus_cfg.link_frequencies[i] == + og0va1b_link_freqs[OG0VA1B_LINK_FREQ_INDEX]) + break; + + if (i == bus_cfg.nr_of_link_frequencies) + ret = dev_err_probe(dev, -EINVAL, + "no supported link frequency %lld found\n", + og0va1b_link_freqs[OG0VA1B_LINK_FREQ_INDEX]); + +err_free: + v4l2_fwnode_endpoint_free(&bus_cfg); + + return ret; +} + +static int og0va1b_init(struct og0va1b *og0va1b, + const struct og0va1b_mode *mode) +{ + int ret; + + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_SW_RESET, + OG0VA1B_SW_RESET, NULL); + if (ret) + return ret; + + usleep_range(5000, 6000); + + return cci_multi_reg_write(og0va1b->regmap, mode->regs, mode->num_regs, + NULL); +} + +static int og0va1b_s_ctrl(struct v4l2_ctrl *ctrl) +{ + struct og0va1b *og0va1b = + container_of(ctrl->handler, struct og0va1b, ctrl_handler); + const struct og0va1b_mode *mode = &og0va1b_modes[0]; + int ret = 0; + + if (ctrl->id == V4L2_CID_VBLANK) { + int exp_max = mode->height + ctrl->val - OG0VA1B_EXPOSURE_MARGIN; + + ret = __v4l2_ctrl_modify_range(og0va1b->exposure, + og0va1b->exposure->minimum, + exp_max, + og0va1b->exposure->step, + min(og0va1b->exposure->val, exp_max)); + if (ret) + return ret; + } + + if (!pm_runtime_get_if_active(og0va1b->sd.dev)) + return 0; + + switch (ctrl->id) { + case V4L2_CID_EXPOSURE: + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_EXPOSURE, + ctrl->val, NULL); + break; + + case V4L2_CID_ANALOGUE_GAIN: + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_GAIN_H, + (ctrl->val >> 4) & 0x1f, NULL); + if (!ret) + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_GAIN_L, + (ctrl->val & 0xf) << 4, NULL); + break; + + case V4L2_CID_VBLANK: + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_VTS, + mode->height + ctrl->val, NULL); + break; + + case V4L2_CID_TEST_PATTERN: + if (ctrl->val) + ret = cci_write(og0va1b->regmap, + OG0VA1B_REG_TEST_PATTERN, + (ctrl->val - 1) << OG0VA1B_TEST_PATTERN_BAR_SHIFT | + OG0VA1B_TEST_PATTERN_EN, NULL); + else + ret = cci_write(og0va1b->regmap, + OG0VA1B_REG_TEST_PATTERN, 0, NULL); + break; + + default: + ret = -EINVAL; + break; + } + + pm_runtime_put_autosuspend(og0va1b->sd.dev); + return ret; +} + +static const struct v4l2_ctrl_ops og0va1b_ctrl_ops = { + .s_ctrl = og0va1b_s_ctrl, +}; + +static const char * const og0va1b_test_pattern_menu[] = { + "Disabled", + "Standard Color Bar", + "Top-Bottom Darker Color Bar", + "Right-Left Darker Color Bar", + "Bottom-Top Darker Color Bar", +}; + +static void og0va1b_fill_format(const struct og0va1b_mode *mode, + struct v4l2_mbus_framefmt *fmt) +{ + fmt->width = mode->width; + fmt->height = mode->height; + fmt->code = MEDIA_BUS_FMT_Y10_1X10; + fmt->field = V4L2_FIELD_NONE; + fmt->colorspace = V4L2_COLORSPACE_RAW; + fmt->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; + fmt->quantization = V4L2_QUANTIZATION_DEFAULT; + fmt->xfer_func = V4L2_XFER_FUNC_NONE; +} + +static int og0va1b_enum_mbus_code(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + struct v4l2_subdev_mbus_code_enum *code) +{ + if (code->index != 0) + return -EINVAL; + + code->code = MEDIA_BUS_FMT_Y10_1X10; + return 0; +} + +static int og0va1b_enum_frame_size(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + struct v4l2_subdev_frame_size_enum *fse) +{ + if (fse->code != MEDIA_BUS_FMT_Y10_1X10 || + fse->index >= ARRAY_SIZE(og0va1b_modes)) + return -EINVAL; + + fse->min_width = og0va1b_modes[fse->index].width; + fse->max_width = og0va1b_modes[fse->index].width; + fse->min_height = og0va1b_modes[fse->index].height; + fse->max_height = og0va1b_modes[fse->index].height; + return 0; +} + +static int og0va1b_set_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + struct v4l2_subdev_format *fmt) +{ + const struct og0va1b_mode *mode; + struct v4l2_mbus_framefmt *format; + + mode = v4l2_find_nearest_size(og0va1b_modes, + ARRAY_SIZE(og0va1b_modes), + width, height, + fmt->format.width, fmt->format.height); + + og0va1b_fill_format(mode, &fmt->format); + + format = v4l2_subdev_state_get_format(state, 0); + *format = fmt->format; + + return 0; +} + +static int og0va1b_init_state(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state) +{ + struct v4l2_mbus_framefmt *fmt = + v4l2_subdev_state_get_format(state, 0); + + og0va1b_fill_format(&og0va1b_modes[0], fmt); + return 0; +} + +static int og0va1b_enable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask) +{ + struct og0va1b *og0va1b = sd_to_og0va1b(sd); + const struct og0va1b_mode *mode = &og0va1b_modes[0]; + int ret; + + ret = pm_runtime_resume_and_get(og0va1b->sd.dev); + if (ret < 0) + return ret; + + ret = og0va1b_init(og0va1b, mode); + if (ret) + goto err_pm; + + ret = __v4l2_ctrl_handler_setup(&og0va1b->ctrl_handler); + if (ret) + goto err_pm; + + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_STREAMING, + OG0VA1B_STREAMING_ON, NULL); + if (ret) + goto err_pm; + + return 0; + +err_pm: + pm_runtime_put_autosuspend(og0va1b->sd.dev); + return ret; +} + +static int og0va1b_disable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask) +{ + struct og0va1b *og0va1b = sd_to_og0va1b(sd); + int ret; + + ret = cci_write(og0va1b->regmap, OG0VA1B_REG_STREAMING, 0, NULL); + if (ret) + dev_warn(og0va1b->sd.dev, + "failed to stop streaming: %d\n", ret); + + usleep_range(5000, 6000); + pm_runtime_put_autosuspend(og0va1b->sd.dev); + + return 0; +} + +static const struct dev_pm_ops og0va1b_pm_ops = { + SET_RUNTIME_PM_OPS(og0va1b_power_off, og0va1b_power_on, NULL) +}; + +static const struct v4l2_subdev_video_ops og0va1b_video_ops = { + .s_stream = v4l2_subdev_s_stream_helper, +}; + +static const struct v4l2_subdev_pad_ops og0va1b_pad_ops = { + .enum_mbus_code = og0va1b_enum_mbus_code, + .enum_frame_size = og0va1b_enum_frame_size, + .get_fmt = v4l2_subdev_get_fmt, + .set_fmt = og0va1b_set_fmt, + .enable_streams = og0va1b_enable_streams, + .disable_streams = og0va1b_disable_streams, +}; + +static const struct v4l2_subdev_ops og0va1b_subdev_ops = { + .video = &og0va1b_video_ops, + .pad = &og0va1b_pad_ops, +}; + +static const struct v4l2_subdev_internal_ops og0va1b_internal_ops = { + .init_state = og0va1b_init_state, +}; + +static const struct media_entity_operations og0va1b_entity_ops = { + .link_validate = v4l2_subdev_link_validate, +}; + +static int og0va1b_init_controls(struct og0va1b *og0va1b) +{ + struct v4l2_ctrl_handler *hdl = &og0va1b->ctrl_handler; + const struct og0va1b_mode *mode = &og0va1b_modes[0]; + struct v4l2_fwnode_device_properties props; + int vblank_def = mode->vts - mode->height; + int vblank_max = 0xffff - mode->height; + int hblank_val = mode->hts - mode->width; + int ret; + + v4l2_ctrl_handler_init(hdl, 9); + + og0va1b->link_freq = + v4l2_ctrl_new_int_menu(hdl, NULL, V4L2_CID_LINK_FREQ, + ARRAY_SIZE(og0va1b_link_freqs) - 1, 0, + og0va1b_link_freqs); + if (og0va1b->link_freq) + og0va1b->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY; + + og0va1b->pixel_rate = + v4l2_ctrl_new_std(hdl, NULL, V4L2_CID_PIXEL_RATE, + OG0VA1B_PIXEL_RATE, OG0VA1B_PIXEL_RATE, 1, + OG0VA1B_PIXEL_RATE); + + og0va1b->vblank = + v4l2_ctrl_new_std(hdl, &og0va1b_ctrl_ops, V4L2_CID_VBLANK, + OG0VA1B_VBLANK_MIN, vblank_max, 1, vblank_def); + + og0va1b->hblank = + v4l2_ctrl_new_std(hdl, NULL, V4L2_CID_HBLANK, + hblank_val, hblank_val, 1, hblank_val); + if (og0va1b->hblank) + og0va1b->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; + + og0va1b->exposure = + v4l2_ctrl_new_std(hdl, &og0va1b_ctrl_ops, V4L2_CID_EXPOSURE, + OG0VA1B_EXPOSURE_MIN, + mode->vts - OG0VA1B_EXPOSURE_MARGIN, + OG0VA1B_EXPOSURE_STEP, + OG0VA1B_EXPOSURE_DEFAULT); + + og0va1b->gain = + v4l2_ctrl_new_std(hdl, &og0va1b_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, + OG0VA1B_GAIN_MIN, OG0VA1B_GAIN_MAX, + OG0VA1B_GAIN_STEP, OG0VA1B_GAIN_DEFAULT); + + og0va1b->test_pattern = + v4l2_ctrl_new_std_menu_items(hdl, &og0va1b_ctrl_ops, + V4L2_CID_TEST_PATTERN, + ARRAY_SIZE(og0va1b_test_pattern_menu) - 1, + 0, 0, og0va1b_test_pattern_menu); + + ret = v4l2_fwnode_device_parse(og0va1b->sd.dev, &props); + if (ret) + goto err_free; + + ret = v4l2_ctrl_new_fwnode_properties(hdl, &og0va1b_ctrl_ops, &props); + if (ret) + goto err_free; + + if (hdl->error) { + ret = hdl->error; + goto err_free; + } + + og0va1b->sd.ctrl_handler = hdl; + return 0; + +err_free: + v4l2_ctrl_handler_free(hdl); + return ret; +} + +static int og0va1b_probe(struct i2c_client *client) +{ + struct device *dev = &client->dev; + struct og0va1b *og0va1b; + unsigned long clk_rate; + unsigned int i; + int ret; + + og0va1b = devm_kzalloc(dev, sizeof(*og0va1b), GFP_KERNEL); + if (!og0va1b) + return -ENOMEM; + + v4l2_i2c_subdev_init(&og0va1b->sd, client, &og0va1b_subdev_ops); + og0va1b->sd.internal_ops = &og0va1b_internal_ops; + og0va1b->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + + og0va1b->inclk = devm_v4l2_sensor_clk_get(dev, NULL); + if (IS_ERR(og0va1b->inclk)) + return dev_err_probe(dev, PTR_ERR(og0va1b->inclk), + "failed to get clock\n"); + + clk_rate = clk_get_rate(og0va1b->inclk); + if (clk_rate != OG0VA1B_XVCLK_RATE) + return dev_err_probe(dev, -EINVAL, + "clock rate %lu Hz != required %lu Hz\n", + clk_rate, OG0VA1B_XVCLK_RATE); + + ret = og0va1b_check_hwcfg(dev); + if (ret) + return ret; + + og0va1b->reset_gpio = devm_gpiod_get_optional(dev, "reset", + GPIOD_OUT_HIGH); + if (IS_ERR(og0va1b->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(og0va1b->reset_gpio), + "failed to get reset GPIO\n"); + + for (i = 0; i < OG0VA1B_NUM_SUPPLIES; i++) + og0va1b->supplies[i].supply = og0va1b_supply_names[i]; + + ret = devm_regulator_bulk_get(dev, OG0VA1B_NUM_SUPPLIES, + og0va1b->supplies); + if (ret) + return dev_err_probe(dev, ret, + "failed to get regulators\n"); + + og0va1b->regmap = devm_cci_regmap_init_i2c(client, 16); + if (IS_ERR(og0va1b->regmap)) + return dev_err_probe(dev, PTR_ERR(og0va1b->regmap), + "failed to init CCI regmap\n"); + + ret = og0va1b_power_on(dev); + if (ret) + return ret; + + ret = og0va1b_check_id(og0va1b); + if (ret) + goto err_power_off; + + ret = og0va1b_init_controls(og0va1b); + if (ret) + goto err_power_off; + + og0va1b->sd.entity.ops = &og0va1b_entity_ops; + og0va1b->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR; + og0va1b->pad.flags = MEDIA_PAD_FL_SOURCE; + ret = media_entity_pads_init(&og0va1b->sd.entity, 1, &og0va1b->pad); + if (ret) + goto err_controls; + + og0va1b->sd.state_lock = og0va1b->ctrl_handler.lock; + ret = v4l2_subdev_init_finalize(&og0va1b->sd); + if (ret) + goto err_entity; + + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + ret = v4l2_async_register_subdev_sensor(&og0va1b->sd); + if (ret) + goto err_pm; + + pm_runtime_set_autosuspend_delay(dev, OG0VA1B_AUTOSUSPEND_DELAY_MS); + pm_runtime_use_autosuspend(dev); + pm_runtime_idle(dev); + + return 0; + +err_pm: + pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); +err_entity: + v4l2_subdev_cleanup(&og0va1b->sd); + media_entity_cleanup(&og0va1b->sd.entity); +err_controls: + v4l2_ctrl_handler_free(&og0va1b->ctrl_handler); +err_power_off: + og0va1b_power_off(dev); + + return ret; +} + +static void og0va1b_remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct device *dev = &client->dev; + + v4l2_async_unregister_subdev(sd); + v4l2_subdev_cleanup(sd); + v4l2_ctrl_handler_free(sd->ctrl_handler); + media_entity_cleanup(&sd->entity); + + pm_runtime_dont_use_autosuspend(dev); + pm_runtime_disable(dev); + + if (!pm_runtime_status_suspended(dev)) + og0va1b_power_off(dev); + + pm_runtime_set_suspended(dev); +} + +static const struct i2c_device_id og0va1b_id[] = { + { "og0va1b" }, + { } +}; +MODULE_DEVICE_TABLE(i2c, og0va1b_id); + +static const struct of_device_id og0va1b_of_match[] = { + { .compatible = "ovti,og0va1b" }, + { } +}; +MODULE_DEVICE_TABLE(of, og0va1b_of_match); + +static struct i2c_driver og0va1b_i2c_driver = { + .driver = { + .name = "og0va1b", + .of_match_table = og0va1b_of_match, + .pm = pm_ptr(&og0va1b_pm_ops), + }, + .probe = og0va1b_probe, + .remove = og0va1b_remove, + .id_table = og0va1b_id, +}; +module_i2c_driver(og0va1b_i2c_driver); + +MODULE_AUTHOR("Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>"); +MODULE_DESCRIPTION("OmniVision OG0VA1B sensor driver"); +MODULE_LICENSE("GPL"); -- 2.34.1
Add OmniVision OG0VA1B driver support. The OmniVision OG0VA1B is a 1/10-inch monochrome CMOS VGA image sensor. It outputs 10-bit raw (Y10) frames at up to 640x480 resolution over a single-lane MIPI CSI-2 interface and is controlled via an I2C-compatible SCCB bus. This driver has been verified(include tpg) on the Purwa EVK. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- Changes in v3: - Generalise the binding title and description for both sensors. -- Vladimir - Keep the cached pre_isp read so the OG0VE1B test pattern still works, select it via a per-sensor callback. -- Bryan, Vladimir - Rename the "sensor" field to "data", drop bpp (derive from code) and add og0ve1b_pixel_rate(). -- Vladimir - Sort defines, rename the shared CHIP_ID reg to OG0V_ and order og0va1b_data first. -- Vladimir - Expose all four OG0VA1B test patterns instead of one. - Link to v2: https://lore.kernel.org/r/20260702-og0va1b-v2-0-0071442caa2a@oss.qualcomm.com Changes in v2: - Integrate OG0VA1B into the existing og0ve1b driver and binding instead. -- Vladimir - Link to v1: https://lore.kernel.org/r/20260618-og0va1b-v1-0-dda71bb83009@oss.qualcomm.com --- Wenmeng Liu (3): dt-bindings: media: i2c: og0ve1b: Add OmniVision OG0VA1B camera sensor media: i2c: og0ve1b: Introduce per-sensor data structure media: i2c: og0ve1b: Add support for OmniVision OG0VA1B .../bindings/media/i2c/ovti,og0ve1b.yaml | 15 +- drivers/media/i2c/og0ve1b.c | 375 ++++++++++++++++++--- 2 files changed, 344 insertions(+), 46 deletions(-) --- base-commit: 5c73cd9f0819c1c44e373e3dabb68318b1de1a12 change-id: 20260618-og0va1b-55bbf3cabb0e Best regards, -- Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
The OmniVision OG0VA1B is a monochrome image sensor closely related to the already supported OG0VE1B. It shares the same SCCB control interface, power supplies and MIPI D-PHY description, but differs in its chip ID, register programming and output format. Generalise the binding title and description to cover both sensors. Acked-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- .../devicetree/bindings/media/i2c/ovti,og0ve1b.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/media/i2c/ovti,og0ve1b.yaml b/Documentation/devicetree/bindings/media/i2c/ovti,og0ve1b.yaml index XXXXXXX..XXXXXXX 100644 --- a/Documentation/devicetree/bindings/media/i2c/ovti,og0ve1b.yaml +++ b/Documentation/devicetree/bindings/media/i2c/ovti,og0ve1b.yaml @@ -XXX,XX +XXX,XX @@ $id: http://devicetree.org/schemas/media/i2c/ovti,og0ve1b.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: OmniVision OG0VE1B Image Sensor +title: OmniVision OG0VA1B and OG0VE1B Image Sensors description: - OmniVision OG0VE1B image sensor is a low power consuming monochrome - image sensor. The sensor is controlled over a serial camera control - bus protocol (SCCB), the widest supported image size is 640x480 at - 120 frames per second rate, data output format is 8/10-bit RAW - transferred over one-lane MIPI D-PHY at up to 800 Mbps. + OmniVision OG0VA1B and OG0VE1B are low power consuming monochrome image + sensors. The sensors are controlled over a serial camera control bus + protocol (SCCB), the widest supported image size is 640x480, data output + format is 8/10-bit RAW transferred over one-lane MIPI D-PHY. maintainers: - Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> @@ -XXX,XX +XXX,XX @@ allOf: properties: compatible: - const: ovti,og0ve1b + enum: + - ovti,og0va1b + - ovti,og0ve1b reg: maxItems: 1 -- 2.34.1
Refactor the driver to separate sensor-specific data from the common driver code. Introduce a sensor_data structure, populated through i2c_get_match_data(), to hold the chip ID, MCLK frequency, link frequencies and supported modes. Test pattern programming is described by a per-sensor callback, and each mode stores its media bus format code (rather than a bits-per-pixel value) so that sensors with a different output format can be supported. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- drivers/media/i2c/og0ve1b.c | 99 ++++++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 28 deletions(-) diff --git a/drivers/media/i2c/og0ve1b.c b/drivers/media/i2c/og0ve1b.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/media/i2c/og0ve1b.c +++ b/drivers/media/i2c/og0ve1b.c @@ -XXX,XX +XXX,XX @@ struct og0ve1b_mode { u32 height; /* Frame height in pixels */ u32 hts; /* Horizontal timing size */ u32 vts; /* Default vertical timing size */ - u32 bpp; /* Bits per pixel */ + u32 code; /* MEDIA_BUS_FMT code */ const struct og0ve1b_reg_list reg_list; /* Sensor register setting */ }; +struct og0ve1b; + +struct og0ve1b_sensor_data { + u64 chip_id; + unsigned long mclk_freq; + int (*enable_test_pattern)(struct og0ve1b *og0ve1b, u32 pattern); + const s64 *link_freq_menu; + int num_link_freqs; + const struct og0ve1b_mode *modes; + int num_modes; +}; + static const char * const og0ve1b_test_pattern_menu[] = { "Disabled", "Vertical Colour Bars", @@ -XXX,XX +XXX,XX @@ struct og0ve1b { /* Saved register value */ u64 pre_isp; + + const struct og0ve1b_sensor_data *data; }; static const struct cci_reg_sequence og0ve1b_640x480_120fps_mode[] = { @@ -XXX,XX +XXX,XX @@ static const struct cci_reg_sequence og0ve1b_640x480_120fps_mode[] = { { CCI_REG8(0x3f47), 0x35 }, }; -static const struct og0ve1b_mode supported_modes[] = { +static const struct og0ve1b_mode og0ve1b_supported_modes[] = { { .width = 640, .height = 480, .hts = 792, .vts = 568, - .bpp = 8, + .code = MEDIA_BUS_FMT_Y8_1X8, .reg_list = { .regs = og0ve1b_640x480_120fps_mode, .num_regs = ARRAY_SIZE(og0ve1b_640x480_120fps_mode), @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enable_test_pattern(struct og0ve1b *og0ve1b, u32 pattern) return cci_write(og0ve1b->regmap, OG0VE1B_REG_PRE_ISP, val, NULL); } +static const struct og0ve1b_sensor_data og0ve1b_data = { + .chip_id = OG0VE1B_CHIP_ID, + .mclk_freq = OG0VE1B_MCLK_FREQ_24MHZ, + .enable_test_pattern = og0ve1b_enable_test_pattern, + .link_freq_menu = og0ve1b_link_freq_menu, + .num_link_freqs = ARRAY_SIZE(og0ve1b_link_freq_menu), + .modes = og0ve1b_supported_modes, + .num_modes = ARRAY_SIZE(og0ve1b_supported_modes), +}; + static int og0ve1b_set_ctrl(struct v4l2_ctrl *ctrl) { struct og0ve1b *og0ve1b = container_of(ctrl->handler, struct og0ve1b, ctrl_handler); - const struct og0ve1b_mode *mode = &supported_modes[0]; + const struct og0ve1b_mode *mode = &og0ve1b->data->modes[0]; s64 exposure_max; int ret; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_set_ctrl(struct v4l2_ctrl *ctrl) ctrl->val + mode->height, NULL); break; case V4L2_CID_TEST_PATTERN: - ret = og0ve1b_enable_test_pattern(og0ve1b, ctrl->val); + ret = og0ve1b->data->enable_test_pattern(og0ve1b, ctrl->val); break; default: ret = -EINVAL; @@ -XXX,XX +XXX,XX @@ static const struct v4l2_ctrl_ops og0ve1b_ctrl_ops = { .s_ctrl = og0ve1b_set_ctrl, }; +static s64 og0ve1b_pixel_rate(const struct og0ve1b_sensor_data *data) +{ + const struct og0ve1b_mode *mode = &data->modes[0]; + unsigned int bpp = mode->code == MEDIA_BUS_FMT_Y8_1X8 ? 8 : 10; + + return data->link_freq_menu[0] / bpp; +} + static int og0ve1b_init_controls(struct og0ve1b *og0ve1b) { struct v4l2_ctrl_handler *ctrl_hdlr = &og0ve1b->ctrl_handler; - const struct og0ve1b_mode *mode = &supported_modes[0]; + const struct og0ve1b_mode *mode = &og0ve1b->data->modes[0]; + const struct og0ve1b_sensor_data *data = og0ve1b->data; s64 exposure_max, pixel_rate, h_blank, v_blank; struct v4l2_fwnode_device_properties props; struct v4l2_ctrl *ctrl; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_init_controls(struct og0ve1b *og0ve1b) ctrl = v4l2_ctrl_new_int_menu(ctrl_hdlr, &og0ve1b_ctrl_ops, V4L2_CID_LINK_FREQ, - ARRAY_SIZE(og0ve1b_link_freq_menu) - 1, - 0, og0ve1b_link_freq_menu); + data->num_link_freqs - 1, + 0, data->link_freq_menu); if (ctrl) ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; - pixel_rate = og0ve1b_link_freq_menu[0] / mode->bpp; + pixel_rate = og0ve1b_pixel_rate(data); v4l2_ctrl_new_std(ctrl_hdlr, &og0ve1b_ctrl_ops, V4L2_CID_PIXEL_RATE, 0, pixel_rate, 1, pixel_rate); @@ -XXX,XX +XXX,XX @@ static int og0ve1b_init_controls(struct og0ve1b *og0ve1b) static void og0ve1b_update_pad_format(const struct og0ve1b_mode *mode, struct v4l2_mbus_framefmt *fmt) { - fmt->code = MEDIA_BUS_FMT_Y8_1X8; + fmt->code = mode->code; fmt->width = mode->width; fmt->height = mode->height; fmt->field = V4L2_FIELD_NONE; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enable_streams(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, u32 pad, u64 streams_mask) { - const struct og0ve1b_reg_list *reg_list = &supported_modes[0].reg_list; struct og0ve1b *og0ve1b = to_og0ve1b(sd); + const struct og0ve1b_reg_list *reg_list = &og0ve1b->data->modes[0].reg_list; int ret; ret = pm_runtime_resume_and_get(og0ve1b->dev); @@ -XXX,XX +XXX,XX @@ static int og0ve1b_set_pad_format(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_format *fmt) { + struct og0ve1b *og0ve1b = to_og0ve1b(sd); struct v4l2_mbus_framefmt *format; const struct og0ve1b_mode *mode; format = v4l2_subdev_state_get_format(state, 0); - mode = v4l2_find_nearest_size(supported_modes, - ARRAY_SIZE(supported_modes), + mode = v4l2_find_nearest_size(og0ve1b->data->modes, + og0ve1b->data->num_modes, width, height, fmt->format.width, fmt->format.height); @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_mbus_code_enum *code) { + struct og0ve1b *og0ve1b = to_og0ve1b(sd); + if (code->index > 0) return -EINVAL; - code->code = MEDIA_BUS_FMT_Y8_1X8; + code->code = og0ve1b->data->modes[0].code; return 0; } @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enum_frame_size(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_frame_size_enum *fse) { - if (fse->index >= ARRAY_SIZE(supported_modes)) + struct og0ve1b *og0ve1b = to_og0ve1b(sd); + const struct og0ve1b_sensor_data *data = og0ve1b->data; + + if (fse->index >= data->num_modes) return -EINVAL; - if (fse->code != MEDIA_BUS_FMT_Y8_1X8) + if (fse->code != data->modes[fse->index].code) return -EINVAL; - fse->min_width = supported_modes[fse->index].width; + fse->min_width = data->modes[fse->index].width; fse->max_width = fse->min_width; - fse->min_height = supported_modes[fse->index].height; + fse->min_height = data->modes[fse->index].height; fse->max_height = fse->min_height; return 0; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enum_frame_size(struct v4l2_subdev *sd, static int og0ve1b_init_state(struct v4l2_subdev *sd, struct v4l2_subdev_state *state) { + const struct og0ve1b_mode *mode = &to_og0ve1b(sd)->data->modes[0]; struct v4l2_subdev_format fmt = { .which = V4L2_SUBDEV_FORMAT_TRY, .pad = 0, .format = { - .code = MEDIA_BUS_FMT_Y8_1X8, - .width = supported_modes[0].width, - .height = supported_modes[0].height, + .code = mode->code, + .width = mode->width, + .height = mode->height, }, }; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_identify_sensor(struct og0ve1b *og0ve1b) return ret; } - if (val != OG0VE1B_CHIP_ID) { - dev_err(og0ve1b->dev, "chip id mismatch: %x!=%llx\n", - OG0VE1B_CHIP_ID, val); + if (val != og0ve1b->data->chip_id) { + dev_err(og0ve1b->dev, "chip id mismatch: %llx!=%llx\n", + og0ve1b->data->chip_id, val); return -ENODEV; } @@ -XXX,XX +XXX,XX @@ static int og0ve1b_check_hwcfg(struct og0ve1b *og0ve1b) ret = v4l2_link_freq_to_bitmap(og0ve1b->dev, bus_cfg.link_frequencies, bus_cfg.nr_of_link_frequencies, - og0ve1b_link_freq_menu, - ARRAY_SIZE(og0ve1b_link_freq_menu), + og0ve1b->data->link_freq_menu, + og0ve1b->data->num_link_freqs, &freq_bitmap); v4l2_fwnode_endpoint_free(&bus_cfg); @@ -XXX,XX +XXX,XX @@ static int og0ve1b_probe(struct i2c_client *client) return -ENOMEM; og0ve1b->dev = &client->dev; + og0ve1b->data = i2c_get_match_data(client); + if (!og0ve1b->data) + return -ENODEV; v4l2_i2c_subdev_init(&og0ve1b->sd, client, &og0ve1b_subdev_ops); @@ -XXX,XX +XXX,XX @@ static int og0ve1b_probe(struct i2c_client *client) "failed to get XVCLK clock\n"); freq = clk_get_rate(og0ve1b->xvclk); - if (freq && freq != OG0VE1B_MCLK_FREQ_24MHZ) + if (freq && freq != og0ve1b->data->mclk_freq) return dev_err_probe(og0ve1b->dev, -EINVAL, "XVCLK clock frequency %lu is not supported\n", freq); @@ -XXX,XX +XXX,XX @@ static const struct dev_pm_ops og0ve1b_pm_ops = { }; static const struct of_device_id og0ve1b_of_match[] = { - { .compatible = "ovti,og0ve1b" }, + { .compatible = "ovti,og0ve1b", .data = &og0ve1b_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, og0ve1b_of_match); -- 2.34.1
The OmniVision OG0VA1B is a monochrome image sensor closely related to the OG0VE1B. It shares the SCCB control interface, power supplies and the single-lane MIPI D-PHY description, and differs in its chip id, the test pattern register, the register programming and the output format (10-bit RAW instead of 8-bit). Add an og0ve1b_sensor_data entry describing the OG0VA1B together with its 640x480 60fps register sequence. Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> --- drivers/media/i2c/og0ve1b.c | 278 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 266 insertions(+), 12 deletions(-) diff --git a/drivers/media/i2c/og0ve1b.c b/drivers/media/i2c/og0ve1b.c index XXXXXXX..XXXXXXX 100644 --- a/drivers/media/i2c/og0ve1b.c +++ b/drivers/media/i2c/og0ve1b.c @@ -XXX,XX +XXX,XX @@ #include <media/v4l2-device.h> #include <media/v4l2-fwnode.h> +#define OG0VA1B_LINK_FREQ_480MHZ (480 * HZ_PER_MHZ) +#define OG0VA1B_MCLK_FREQ_19_2MHZ (19200 * HZ_PER_KHZ) + #define OG0VE1B_LINK_FREQ_500MHZ (500 * HZ_PER_MHZ) #define OG0VE1B_MCLK_FREQ_24MHZ (24 * HZ_PER_MHZ) -#define OG0VE1B_REG_CHIP_ID CCI_REG24(0x300a) +#define OG0V_REG_CHIP_ID CCI_REG24(0x300a) +#define OG0VA1B_CHIP_ID 0xc75641 #define OG0VE1B_CHIP_ID 0xc75645 #define OG0VE1B_REG_MODE_SELECT CCI_REG8(0x0100) @@ -XXX,XX +XXX,XX @@ #define OG0VE1B_REG_VTS CCI_REG16(0x380e) #define OG0VE1B_VTS_MAX 0xffff -/* Test pattern */ +/* Test pattern - OG0VA1B uses 0x5100, OG0VE1B uses 0x5e00 */ +#define OG0VA1B_REG_TEST_PATTERN CCI_REG8(0x5100) +#define OG0VA1B_TEST_PATTERN_BAR_SHIFT 2 #define OG0VE1B_REG_PRE_ISP CCI_REG8(0x5e00) #define OG0VE1B_TEST_PATTERN_ENABLE BIT(7) #define to_og0ve1b(_sd) container_of(_sd, struct og0ve1b, sd) +static const s64 og0va1b_link_freq_menu[] = { + OG0VA1B_LINK_FREQ_480MHZ, +}; + static const s64 og0ve1b_link_freq_menu[] = { OG0VE1B_LINK_FREQ_500MHZ, }; @@ -XXX,XX +XXX,XX @@ struct og0ve1b_mode { struct og0ve1b; struct og0ve1b_sensor_data { + const char *name; u64 chip_id; unsigned long mclk_freq; int (*enable_test_pattern)(struct og0ve1b *og0ve1b, u32 pattern); + const char * const *test_pattern_menu; + int num_test_patterns; + bool cache_test_pattern_reg; + /* Exposure register unit: OG0VE1B 1/16 line (4), OG0VA1B whole lines (0). */ + unsigned int exposure_shift; + /* Pixel rate multiplier: OG0VA1B uses CSI-2 DDR (2), OG0VE1B keeps 1. */ + unsigned int pixel_rate_mul; const s64 *link_freq_menu; int num_link_freqs; const struct og0ve1b_mode *modes; int num_modes; }; +static const char * const og0va1b_test_pattern_menu[] = { + "Disabled", + "Standard Color Bar", + "Top-Bottom Darker Color Bar", + "Right-Left Darker Color Bar", + "Bottom-Top Darker Color Bar", +}; + static const char * const og0ve1b_test_pattern_menu[] = { "Disabled", "Vertical Colour Bars", @@ -XXX,XX +XXX,XX @@ struct og0ve1b { const struct og0ve1b_sensor_data *data; }; +static const struct cci_reg_sequence og0va1b_640x480_60fps_mode[] = { + { CCI_REG8(0x0302), 0x31 }, + { CCI_REG8(0x0303), 0x02 }, + { CCI_REG8(0x0304), 0x01 }, + { CCI_REG8(0x0305), 0x90 }, + { CCI_REG8(0x0306), 0x00 }, + { CCI_REG8(0x0323), 0x02 }, + { CCI_REG8(0x0325), 0x68 }, + { CCI_REG8(0x0326), 0xd8 }, + { CCI_REG8(0x3006), 0x0e }, + { CCI_REG8(0x300d), 0x08 }, + { CCI_REG8(0x3018), 0xf0 }, + { CCI_REG8(0x301c), 0xf0 }, + { CCI_REG8(0x3020), 0x20 }, + { CCI_REG8(0x3040), 0x0f }, + { CCI_REG8(0x3022), 0x01 }, + { CCI_REG8(0x3107), 0x40 }, + { CCI_REG8(0x3216), 0x01 }, + { CCI_REG8(0x3217), 0x00 }, + { CCI_REG8(0x3218), 0xc0 }, + { CCI_REG8(0x3219), 0x55 }, + { CCI_REG8(0x3506), 0x01 }, + { CCI_REG8(0x3507), 0x50 }, + { CCI_REG8(0x3508), 0x01 }, + { CCI_REG8(0x3509), 0x00 }, + { CCI_REG8(0x350a), 0x01 }, + { CCI_REG8(0x350b), 0x00 }, + { CCI_REG8(0x350c), 0x00 }, + { CCI_REG8(0x3541), 0x00 }, + { CCI_REG8(0x3542), 0x40 }, + { CCI_REG8(0x3605), 0x90 }, + { CCI_REG8(0x3606), 0x41 }, + { CCI_REG8(0x3612), 0x00 }, + { CCI_REG8(0x3620), 0x08 }, + { CCI_REG8(0x3630), 0x17 }, + { CCI_REG8(0x3631), 0x99 }, + { CCI_REG8(0x3639), 0x88 }, + { CCI_REG8(0x3668), 0x00 }, + { CCI_REG8(0x3674), 0x00 }, + { CCI_REG8(0x3677), 0x3f }, + { CCI_REG8(0x368f), 0x06 }, + { CCI_REG8(0x36a2), 0x19 }, + { CCI_REG8(0x36a4), 0xf1 }, + { CCI_REG8(0x36a5), 0x2d }, + { CCI_REG8(0x3706), 0x30 }, + { CCI_REG8(0x370d), 0x72 }, + { CCI_REG8(0x3713), 0x86 }, + { CCI_REG8(0x3715), 0x03 }, + { CCI_REG8(0x3716), 0x00 }, + { CCI_REG8(0x376d), 0x24 }, + { CCI_REG8(0x3770), 0x3a }, + { CCI_REG8(0x3778), 0x00 }, + { CCI_REG8(0x37a8), 0x03 }, + { CCI_REG8(0x37a9), 0x00 }, + { CCI_REG8(0x37df), 0x7d }, + { CCI_REG8(0x3800), 0x00 }, + { CCI_REG8(0x3801), 0x00 }, + { CCI_REG8(0x3802), 0x00 }, + { CCI_REG8(0x3803), 0x00 }, + { CCI_REG8(0x3804), 0x02 }, + { CCI_REG8(0x3805), 0x8f }, + { CCI_REG8(0x3806), 0x01 }, + { CCI_REG8(0x3807), 0xef }, + { CCI_REG8(0x3808), 0x02 }, + { CCI_REG8(0x3809), 0x80 }, + { CCI_REG8(0x380a), 0x01 }, + { CCI_REG8(0x380b), 0xe0 }, + { CCI_REG8(0x380c), 0x01 }, + { CCI_REG8(0x380d), 0x78 }, + { CCI_REG8(0x380e), 0x08 }, + { CCI_REG8(0x380f), 0x30 }, + { CCI_REG8(0x3810), 0x00 }, + { CCI_REG8(0x3811), 0x08 }, + { CCI_REG8(0x3812), 0x00 }, + { CCI_REG8(0x3813), 0x08 }, + { CCI_REG8(0x3814), 0x11 }, + { CCI_REG8(0x3815), 0x11 }, + { CCI_REG8(0x3816), 0x00 }, + { CCI_REG8(0x3817), 0x01 }, + { CCI_REG8(0x3818), 0x00 }, + { CCI_REG8(0x3819), 0x05 }, + { CCI_REG8(0x3820), 0x40 }, + { CCI_REG8(0x3821), 0x04 }, + { CCI_REG8(0x3823), 0x00 }, + { CCI_REG8(0x3826), 0x00 }, + { CCI_REG8(0x3827), 0x00 }, + { CCI_REG8(0x382b), 0x52 }, + { CCI_REG8(0x384a), 0xa2 }, + { CCI_REG8(0x3858), 0x00 }, + { CCI_REG8(0x3859), 0x00 }, + { CCI_REG8(0x3860), 0x00 }, + { CCI_REG8(0x3861), 0x00 }, + { CCI_REG8(0x3866), 0x0c }, + { CCI_REG8(0x3867), 0x07 }, + { CCI_REG8(0x3884), 0x00 }, + { CCI_REG8(0x3885), 0x08 }, + { CCI_REG8(0x3888), 0x50 }, + { CCI_REG8(0x3893), 0x6c }, + { CCI_REG8(0x3898), 0x00 }, + { CCI_REG8(0x389a), 0x04 }, + { CCI_REG8(0x389b), 0x01 }, + { CCI_REG8(0x389c), 0x0b }, + { CCI_REG8(0x389d), 0xdc }, + { CCI_REG8(0x38b1), 0x04 }, + { CCI_REG8(0x38b2), 0x00 }, + { CCI_REG8(0x38b3), 0x08 }, + { CCI_REG8(0x38c1), 0x46 }, + { CCI_REG8(0x38c9), 0x02 }, + { CCI_REG8(0x38d4), 0x06 }, + { CCI_REG8(0x38d5), 0x5a }, + { CCI_REG8(0x38d6), 0x08 }, + { CCI_REG8(0x38d7), 0x3a }, + { CCI_REG8(0x391f), 0x00 }, + { CCI_REG8(0x3920), 0xaa }, + { CCI_REG8(0x3921), 0x00 }, + { CCI_REG8(0x3922), 0x00 }, + { CCI_REG8(0x3923), 0x00 }, + { CCI_REG8(0x3924), 0x00 }, + { CCI_REG8(0x3925), 0x00 }, + { CCI_REG8(0x3926), 0x00 }, + { CCI_REG8(0x3927), 0x00 }, + { CCI_REG8(0x3928), 0x10 }, + { CCI_REG8(0x3929), 0x01 }, + { CCI_REG8(0x392a), 0xb4 }, + { CCI_REG8(0x392b), 0x00 }, + { CCI_REG8(0x392c), 0x10 }, + { CCI_REG8(0x392d), 0x01 }, + { CCI_REG8(0x392e), 0x78 }, + { CCI_REG8(0x392f), 0x4a }, + { CCI_REG8(0x391e), 0x01 }, + { CCI_REG8(0x389f), 0x08 }, + { CCI_REG8(0x38a0), 0x00 }, + { CCI_REG8(0x38a1), 0x00 }, + { CCI_REG8(0x3a06), 0x06 }, + { CCI_REG8(0x3a07), 0x78 }, + { CCI_REG8(0x3a08), 0x08 }, + { CCI_REG8(0x3a09), 0x80 }, + { CCI_REG8(0x3a52), 0x00 }, + { CCI_REG8(0x3a53), 0x01 }, + { CCI_REG8(0x3a54), 0x0c }, + { CCI_REG8(0x3a55), 0x04 }, + { CCI_REG8(0x3a58), 0x0c }, + { CCI_REG8(0x3a59), 0x04 }, + { CCI_REG8(0x4000), 0xcf }, + { CCI_REG8(0x4003), 0x40 }, + { CCI_REG8(0x4008), 0x04 }, + { CCI_REG8(0x4009), 0x13 }, + { CCI_REG8(0x400a), 0x02 }, + { CCI_REG8(0x400b), 0x34 }, + { CCI_REG8(0x4010), 0x71 }, + { CCI_REG8(0x4042), 0xc3 }, + { CCI_REG8(0x4306), 0x04 }, + { CCI_REG8(0x4307), 0x12 }, + { CCI_REG8(0x4500), 0x70 }, + { CCI_REG8(0x4509), 0x00 }, + { CCI_REG8(0x450b), 0x83 }, + { CCI_REG8(0x4604), 0x68 }, + { CCI_REG8(0x481b), 0x44 }, + { CCI_REG8(0x481f), 0x30 }, + { CCI_REG8(0x4823), 0x44 }, + { CCI_REG8(0x4825), 0x35 }, + { CCI_REG8(0x4837), 0x11 }, + { CCI_REG8(0x4f00), 0x04 }, + { CCI_REG8(0x4f10), 0x04 }, + { CCI_REG8(0x4f21), 0x01 }, + { CCI_REG8(0x4f22), 0x00 }, + { CCI_REG8(0x4f23), 0x54 }, + { CCI_REG8(0x4f24), 0x51 }, + { CCI_REG8(0x4f25), 0x41 }, + { CCI_REG8(0x5000), 0x3f }, + { CCI_REG8(0x5001), 0x80 }, + { CCI_REG8(0x500a), 0x00 }, + { CCI_REG8(0x5100), 0x00 }, + { CCI_REG8(0x5111), 0x20 }, +}; + +static const struct og0ve1b_mode og0va1b_supported_modes[] = { + { + .width = 640, + .height = 480, + .hts = 752, + .vts = 2096, + .code = MEDIA_BUS_FMT_Y10_1X10, + .reg_list = { + .regs = og0va1b_640x480_60fps_mode, + .num_regs = ARRAY_SIZE(og0va1b_640x480_60fps_mode), + }, + }, +}; + static const struct cci_reg_sequence og0ve1b_640x480_120fps_mode[] = { { CCI_REG8(0x30a0), 0x02 }, { CCI_REG8(0x30a1), 0x00 }, @@ -XXX,XX +XXX,XX @@ static const struct og0ve1b_mode og0ve1b_supported_modes[] = { }, }; +static int og0va1b_enable_test_pattern(struct og0ve1b *og0ve1b, u32 pattern) +{ + u64 val = 0; + + if (pattern) + val = ((pattern - 1) << OG0VA1B_TEST_PATTERN_BAR_SHIFT) | + OG0VE1B_TEST_PATTERN_ENABLE; + + return cci_write(og0ve1b->regmap, OG0VA1B_REG_TEST_PATTERN, val, NULL); +} + static int og0ve1b_enable_test_pattern(struct og0ve1b *og0ve1b, u32 pattern) { u64 val = og0ve1b->pre_isp; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_enable_test_pattern(struct og0ve1b *og0ve1b, u32 pattern) return cci_write(og0ve1b->regmap, OG0VE1B_REG_PRE_ISP, val, NULL); } +static const struct og0ve1b_sensor_data og0va1b_data = { + .name = "og0va1b", + .chip_id = OG0VA1B_CHIP_ID, + .mclk_freq = OG0VA1B_MCLK_FREQ_19_2MHZ, + .enable_test_pattern = og0va1b_enable_test_pattern, + .test_pattern_menu = og0va1b_test_pattern_menu, + .num_test_patterns = ARRAY_SIZE(og0va1b_test_pattern_menu), + .exposure_shift = 0, + .pixel_rate_mul = 2, + .link_freq_menu = og0va1b_link_freq_menu, + .num_link_freqs = ARRAY_SIZE(og0va1b_link_freq_menu), + .modes = og0va1b_supported_modes, + .num_modes = ARRAY_SIZE(og0va1b_supported_modes), +}; + static const struct og0ve1b_sensor_data og0ve1b_data = { + .name = "og0ve1b", .chip_id = OG0VE1B_CHIP_ID, .mclk_freq = OG0VE1B_MCLK_FREQ_24MHZ, .enable_test_pattern = og0ve1b_enable_test_pattern, + .test_pattern_menu = og0ve1b_test_pattern_menu, + .num_test_patterns = ARRAY_SIZE(og0ve1b_test_pattern_menu), + .cache_test_pattern_reg = true, + .exposure_shift = 4, + .pixel_rate_mul = 1, .link_freq_menu = og0ve1b_link_freq_menu, .num_link_freqs = ARRAY_SIZE(og0ve1b_link_freq_menu), .modes = og0ve1b_supported_modes, @@ -XXX,XX +XXX,XX @@ static int og0ve1b_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_EXPOSURE: ret = cci_write(og0ve1b->regmap, OG0VE1B_REG_EXPOSURE, - ctrl->val << 4, NULL); + ctrl->val << og0ve1b->data->exposure_shift, + NULL); break; case V4L2_CID_VBLANK: ret = cci_write(og0ve1b->regmap, OG0VE1B_REG_VTS, @@ -XXX,XX +XXX,XX @@ static s64 og0ve1b_pixel_rate(const struct og0ve1b_sensor_data *data) const struct og0ve1b_mode *mode = &data->modes[0]; unsigned int bpp = mode->code == MEDIA_BUS_FMT_Y8_1X8 ? 8 : 10; - return data->link_freq_menu[0] / bpp; + return data->link_freq_menu[0] * data->pixel_rate_mul / bpp; } static int og0ve1b_init_controls(struct og0ve1b *og0ve1b) @@ -XXX,XX +XXX,XX @@ static int og0ve1b_init_controls(struct og0ve1b *og0ve1b) v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &og0ve1b_ctrl_ops, V4L2_CID_TEST_PATTERN, - ARRAY_SIZE(og0ve1b_test_pattern_menu) - 1, - 0, 0, og0ve1b_test_pattern_menu); + data->num_test_patterns - 1, + 0, 0, data->test_pattern_menu); if (ctrl_hdlr->error) return ctrl_hdlr->error; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_identify_sensor(struct og0ve1b *og0ve1b) u64 val; int ret; - ret = cci_read(og0ve1b->regmap, OG0VE1B_REG_CHIP_ID, &val, NULL); + ret = cci_read(og0ve1b->regmap, OG0V_REG_CHIP_ID, &val, NULL); if (ret) { dev_err(og0ve1b->dev, "failed to read chip id: %d\n", ret); return ret; @@ -XXX,XX +XXX,XX @@ static int og0ve1b_identify_sensor(struct og0ve1b *og0ve1b) return -ENODEV; } - ret = cci_read(og0ve1b->regmap, OG0VE1B_REG_PRE_ISP, - &og0ve1b->pre_isp, NULL); - if (ret) - dev_err(og0ve1b->dev, "failed to read pre_isp: %d\n", ret); + if (og0ve1b->data->cache_test_pattern_reg) { + ret = cci_read(og0ve1b->regmap, OG0VE1B_REG_PRE_ISP, + &og0ve1b->pre_isp, NULL); + if (ret) + dev_err(og0ve1b->dev, "failed to read pre_isp: %d\n", ret); + } return ret; } @@ -XXX,XX +XXX,XX @@ static int og0ve1b_probe(struct i2c_client *client) return -ENODEV; v4l2_i2c_subdev_init(&og0ve1b->sd, client, &og0ve1b_subdev_ops); + v4l2_i2c_subdev_set_name(&og0ve1b->sd, client, + og0ve1b->data->name, NULL); og0ve1b->regmap = devm_cci_regmap_init_i2c(client, 16); if (IS_ERR(og0ve1b->regmap)) @@ -XXX,XX +XXX,XX @@ static const struct dev_pm_ops og0ve1b_pm_ops = { }; static const struct of_device_id og0ve1b_of_match[] = { + { .compatible = "ovti,og0va1b", .data = &og0va1b_data }, { .compatible = "ovti,og0ve1b", .data = &og0ve1b_data }, { /* sentinel */ } }; @@ -XXX,XX +XXX,XX @@ static struct i2c_driver og0ve1b_i2c_driver = { module_i2c_driver(og0ve1b_i2c_driver); MODULE_AUTHOR("Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>"); -MODULE_DESCRIPTION("OmniVision OG0VE1B sensor driver"); +MODULE_DESCRIPTION("OmniVision OG0VE1B/OG0VA1B sensor driver"); MODULE_LICENSE("GPL"); -- 2.34.1