From patchwork Tue Apr 16 22:45:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789588 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 182191386BF; Tue, 16 Apr 2024 22:45:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307536; cv=none; b=aKjqxz7qOr0A+IF4F+l1HL2x4qDv8sEoMlJDwpGcAURcJekg8d7UK4zsInzDdrwbBXHsHlwFwUfOTiCteLjcDJqANT8wwFzga+evPsOTKyjnzmkbOD8srf+xbp+WoTZwOTW0tIza5EdIYml6MFnLJenh9FkT25XDUpfIrW5Lr7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307536; c=relaxed/simple; bh=FJrlk6QnL//BUemzFKki2Dq54faR6yE8vBjGpDaJcxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=in/wN63XGxSgC97dj7uiBGwewVUXVhEesAS2qohJb2UgBuwVtkWQcCIcQ+82fYsUST62L6iaWNWQ4ReK+0UJWWak7rSBWYNajtWtrZJLhCu2GhenQL8rWdyvuORXRXLwfEf3A56RgCcjZfhNHefU+6BiiRAJJ/u2ryig/kRbFfE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nXMju8nv; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nXMju8nv" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-516d6e23253so5512551e87.1; Tue, 16 Apr 2024 15:45:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307532; x=1713912332; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1DAM7ahXd7SQRtOs2FSyPEW9HzmQhg/l7bpOIUxyW00=; b=nXMju8nvP9J64lhP8buQVxW6qqr8zZK0pPZsjET2tWHy75Ap4tnRlgPJZAeQv/POXn vzLbJGPbMcQTBMd/bU0qDbVk+mu6DezLS0vXIWEUfOhrTnuFlRCx2dHfC9LPCGiz0saE uDRLPeeEbQFPqklzmPRNf9e6Mo02JAWPeu1MZ5JxqWyK++R8HATHO5OifRFVN4KMMbmo vJoQsiQlU7e/d8a9pCjIFZCd/z9jsq60h/RpHbxgmlrSTfq3d26aVXMYlKxglb5ZE4Ri Cllw4bMTjdO8RQgMrqikyqcSNHSHasuz681AvxZSaqV4tyPVjiirvptpoZpKuNkeD/4B zRUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307532; x=1713912332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1DAM7ahXd7SQRtOs2FSyPEW9HzmQhg/l7bpOIUxyW00=; b=aLJCYVT+iHRTmtj9xcn87gH+QfNF6s6BW7XgYWmFkjP2dMzq22+IlVU86Pr0EmLvQ7 05Wil7BeNl956E6k8yfw3GRKASK/VfLkv6qvNB9cY0xBzi1662oxOEVgHVWIYL6OPqKh aSWKXF/cYdl1JdmRXIRIO/ID3AvgiXrmln9A8Q3gOamx5yurESqQ90XjHE1Y/J/WulPX YxVXxy+2X1Qlj3IxlYZcLQx0OhUHhUVsI95a2gWnNsKj1teKh99wDRzmtgzjTDXsZMTu NSLYosesU4PT8UfVnmmoTBTbPn+570IHaANcwPDgWR9v0Gx2ZQ6YHmocPiKxbFOi6hlO Gn0A== X-Forwarded-Encrypted: i=1; AJvYcCXKbnotw+G7hI2l/JPzJfze1c1mrCUHE0XFwRRAcThUwwKIsTgDN08tYWnnkDU/Rqre3Y/Q2W1rxpUmpw7zOgXfvhFINUhDFvjLwEAn X-Gm-Message-State: AOJu0YxMBgXWmtH4jr37TBgiK6Ab37j8vQJaty86x1g/b7u28m53OZLu 1+KepEhFBIY+KLZPzyefb+QHvkGg3bfZ+Yjsd9NacPISmYFcw1bI0FaBkbplaSo= X-Google-Smtp-Source: AGHT+IFX2Dt4ozv+xwfHUx898pIdk0gN72rg8VtZDXpTZLK+ddEd2acJQT/ZVoYsjvsoQXGlMlyeUA== X-Received: by 2002:ac2:48b7:0:b0:518:6d35:e4cc with SMTP id u23-20020ac248b7000000b005186d35e4ccmr10336742lfg.25.1713307531804; Tue, 16 Apr 2024 15:45:31 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id n12-20020a19550c000000b00515d32e33a8sm1733241lfe.99.2024.04.16.15.45.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:31 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 02/16] media: i2c: ov4689: Sort register definitions by address Date: Wed, 17 Apr 2024 01:45:10 +0300 Message-ID: <20240416224524.1511357-3-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Put register defininitions in the order of increasing register address. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index 9890189bcbd5..c4d4afd38906 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -19,15 +19,15 @@ #include #include -#define CHIP_ID 0x004688 -#define OV4689_REG_CHIP_ID 0x300a - #define OV4689_XVCLK_FREQ 24000000 #define OV4689_REG_CTRL_MODE 0x0100 #define OV4689_MODE_SW_STANDBY 0x0 #define OV4689_MODE_STREAMING BIT(0) +#define OV4689_REG_CHIP_ID 0x300a +#define CHIP_ID 0x004688 + #define OV4689_REG_EXPOSURE 0x3500 #define OV4689_EXPOSURE_MIN 4 #define OV4689_EXPOSURE_STEP 1 @@ -41,12 +41,12 @@ #define OV4689_GAIN_STEP 1 #define OV4689_GAIN_DEFAULT 0x80 +#define OV4689_REG_VTS 0x380e + #define OV4689_REG_TEST_PATTERN 0x5040 #define OV4689_TEST_PATTERN_ENABLE 0x80 #define OV4689_TEST_PATTERN_DISABLE 0x0 -#define OV4689_REG_VTS 0x380e - #define REG_NULL 0xFFFF #define OV4689_REG_VALUE_08BIT 1 From patchwork Tue Apr 16 22:45:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789587 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 413C013A894; Tue, 16 Apr 2024 22:45:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307539; cv=none; b=FAozL+0dfMyVfg6B0yzLsPvYg/TaxIPiAJQWJ+dkD/wQ7UO9IrTtDwIq7BHmo9OKd4nd2xW44ebEKgaYVfshSsX25h53Q521iObY3ELz71D0nQuJGuN7Xon3K8UCxxWhcPYeff9CANn0TwzGotiIMXo0kDOorcjlHPThMUtvE9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307539; c=relaxed/simple; bh=a59o8BdM4+NENNy4/9lvDfZpD8DiPXnQ34d3KNjXO1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u0QzyKod+iI4wRxnmL69oxok0CFCmpcG23e7HlgV0Fg5gDY3YdgBstoUkmz95rCax0zgurKO04QE3vd95yhgwj8k2CCIuaM0tveNghgV6CgmRJaroICEMvpWJKV3YZ7FfTYt/V7D29Ul9iScml22npT3wVmWeX3Adh1EdxTFOoY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=A0MMvCdH; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="A0MMvCdH" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2dae975d0dcso2192611fa.1; Tue, 16 Apr 2024 15:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307535; x=1713912335; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NjHdzKiu/BLpKoeThpfFp+cVAeTn49iR66hzE4gnsbc=; b=A0MMvCdHG0irfMube6UCFM0kgK7nGLQBRbb8MMHBqQfETUsqOq7o5Ys6IUnuKppwYV CXJLw87WkBM8/rMaBC1NI69TjcOPjFozaCLJ0kKBfg0XHHSuSHY4n929nO5CMkZ+l2LQ UQMPX852n9WII3wvDcXiOM9HO9wWy8uBikNVgtbAISjfrt5WAiWjqCx7DinRGWLzxXt+ +9TLSnamQUkYMcwEHwk0oxfxcGqvq4pmJaPEX+qdF4Dy26OdLBFiEeErxrrw2OZUPiyj xX2fKUdi2Z2AfHAcFoXQKonh2QydfeZlPcbKGStp6YDGP/oVImWQNPg6O3fv8mV1KTDD wuJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307535; x=1713912335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NjHdzKiu/BLpKoeThpfFp+cVAeTn49iR66hzE4gnsbc=; b=B3oJwFQbBs3j+FmoHZ1h1ai0qD/ysyf6m8vlQqeg/6Z1s8003k/luF7nS/o4/Tq5po eZgmdOiDSw80cuO1q0DOfalMaaEUxKh6RZC/0UMcH7kSix7iivI+bn73eXFtF5k5Owre ZWhw4NxCM+5wQnRWUceAv2UPYbD+KJMgv2zmbgjEjMBRMnhsOkdFwdZ/2FNr6daeLL8N tLke45ljTz7ldQIMJDejFPp7/KWWpEYpXY4SLgQWd15ugRtL9a0INg0RMcNBN7PZ6tlD KzbVBViAgM1/nR+aAn/ppEC1gGZfbsnZM62yjlC2Jj/yKjjS39sxpuX6LPPeh42/8qeH YMiA== X-Forwarded-Encrypted: i=1; AJvYcCU1jjijNEKzw8Nefk6lWL+tFid2csUBo3DbS22GpHXkx+XUoyo1hcSENux+R1wIzG6QwArAXbrnyXhCLAJEX8loj5Vl9oV89nGIzQ2e X-Gm-Message-State: AOJu0Yz7LaqSJc+aOgkVYr+sNCgvUIv7fzmqSdl1svTCudtgpk5Y40c/ nDIcle3D/P6lT6whcjzaP6ZRts5a0tVQQXC/MTsLL/CRGNkWm0p/LkEXsu+uddg= X-Google-Smtp-Source: AGHT+IHehrH3QaLP4nYqJoUqN0sflmu8+ChJ58BUUBH79TBGh1nDDRhp+lk/QXSilyt4y5y4matPbw== X-Received: by 2002:a2e:848f:0:b0:2d8:4271:8c45 with SMTP id b15-20020a2e848f000000b002d842718c45mr1184701ljh.17.1713307534411; Tue, 16 Apr 2024 15:45:34 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id g25-20020a2e9e59000000b002d6d4192ce8sm1715102ljk.6.2024.04.16.15.45.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:33 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 04/16] media: i2c: ov4689: CCI conversion Date: Wed, 17 Apr 2024 01:45:12 +0300 Message-ID: <20240416224524.1511357-5-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Convert the i2c register accesses to utilize the CCI helper library rather than relying on driver-specific functions. Also, set analogue gain in a single 16-bit write instead of two 8-bit writes. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/ov4689.c | 358 ++++++++++++++----------------------- 2 files changed, 133 insertions(+), 226 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 56f276b920ab..cef6cab14fd4 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -405,6 +405,7 @@ config VIDEO_OV2740 config VIDEO_OV4689 tristate "OmniVision OV4689 sensor support" depends on GPIOLIB + select V4L2_CCI_I2C help This is a Video4Linux2 sensor-level driver for the OmniVision OV4689 camera. diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index f826571f8f68..06a3e02b5c80 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -15,45 +15,35 @@ #include #include #include +#include #include #include #include -#define OV4689_XVCLK_FREQ 24000000 - -#define OV4689_REG_CTRL_MODE 0x0100 +#define OV4689_REG_CTRL_MODE CCI_REG8(0x0100) #define OV4689_MODE_SW_STANDBY 0x0 #define OV4689_MODE_STREAMING BIT(0) -#define OV4689_REG_CHIP_ID 0x300a +#define OV4689_REG_CHIP_ID CCI_REG16(0x300a) #define CHIP_ID 0x004688 -#define OV4689_REG_EXPOSURE 0x3500 +#define OV4689_REG_EXPOSURE CCI_REG24(0x3500) #define OV4689_EXPOSURE_MIN 4 #define OV4689_EXPOSURE_STEP 1 #define OV4689_VTS_MAX 0x7fff -#define OV4689_REG_GAIN_H 0x3508 -#define OV4689_REG_GAIN_L 0x3509 -#define OV4689_GAIN_H_MASK 0x07 -#define OV4689_GAIN_H_SHIFT 8 -#define OV4689_GAIN_L_MASK 0xff +#define OV4689_REG_GAIN CCI_REG16(0x3508) #define OV4689_GAIN_STEP 1 #define OV4689_GAIN_DEFAULT 0x80 -#define OV4689_REG_VTS 0x380e +#define OV4689_REG_VTS CCI_REG16(0x380e) -#define OV4689_REG_TEST_PATTERN 0x5040 +#define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040) #define OV4689_TEST_PATTERN_ENABLE 0x80 #define OV4689_TEST_PATTERN_DISABLE 0x0 -#define REG_NULL 0xFFFF - -#define OV4689_REG_VALUE_08BIT 1 -#define OV4689_REG_VALUE_16BIT 2 -#define OV4689_REG_VALUE_24BIT 3 - #define OV4689_LANES 4 +#define OV4689_XVCLK_FREQ 24000000 static const char *const ov4689_supply_names[] = { "avdd", /* Analog power */ @@ -61,11 +51,6 @@ static const char *const ov4689_supply_names[] = { "dvdd", /* Digital core power */ }; -struct regval { - u16 addr; - u8 val; -}; - enum ov4689_mode_id { OV4689_MODE_2688_1520 = 0, OV4689_NUM_MODES, @@ -84,11 +69,13 @@ struct ov4689_mode { u32 sensor_height; u32 crop_top; u32 crop_left; - const struct regval *reg_list; + const struct cci_reg_sequence *reg_list; + unsigned int num_regs; }; struct ov4689 { struct i2c_client *client; + struct regmap *regmap; struct clk *xvclk; struct gpio_desc *reset_gpio; struct gpio_desc *pwdn_gpio; @@ -122,125 +109,124 @@ struct ov4689_gain_range { * max_framerate 30fps * mipi_datarate per lane 1008Mbps */ -static const struct regval ov4689_2688x1520_regs[] = { +static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { /* System control*/ - { 0x0103, 0x01 }, /* SC_CTRL0103 software_reset = 1 */ - { 0x3000, 0x20 }, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ - { 0x3021, 0x03 }, /* - * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, - * sleep_no_latch_enable = 0 - */ + { CCI_REG8(0x0103), 0x01 }, /* SC_CTRL0103 software_reset = 1 */ + { CCI_REG8(0x3000), 0x20 }, /* SC_CMMN_PAD_OEN0 FSIN_output_enable = 1 */ + { CCI_REG8(0x3021), 0x03 }, /* + * SC_CMMN_MISC_CTRL fst_stby_ctr = 0, + * sleep_no_latch_enable = 0 + */ /* AEC PK */ - { 0x3503, 0x04 }, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ - { 0x352a, 0x08 }, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ + { CCI_REG8(0x3503), 0x04 }, /* AEC_MANUAL gain_input_as_sensor_gain_format = 1 */ + { CCI_REG8(0x352a), 0x08 }, /* DIG_GAIN_FRAC_LONG dig_gain_long[14:8] = 0x08 (2x) */ /* ADC and analog control*/ - { 0x3603, 0x40 }, - { 0x3604, 0x02 }, - { 0x3609, 0x12 }, - { 0x360c, 0x08 }, - { 0x360f, 0xe5 }, - { 0x3608, 0x8f }, - { 0x3611, 0x00 }, - { 0x3613, 0xf7 }, - { 0x3616, 0x58 }, - { 0x3619, 0x99 }, - { 0x361b, 0x60 }, - { 0x361e, 0x79 }, - { 0x3634, 0x10 }, - { 0x3635, 0x10 }, - { 0x3636, 0x15 }, - { 0x3646, 0x86 }, - { 0x364a, 0x0b }, + { CCI_REG8(0x3603), 0x40 }, + { CCI_REG8(0x3604), 0x02 }, + { CCI_REG8(0x3609), 0x12 }, + { CCI_REG8(0x360c), 0x08 }, + { CCI_REG8(0x360f), 0xe5 }, + { CCI_REG8(0x3608), 0x8f }, + { CCI_REG8(0x3611), 0x00 }, + { CCI_REG8(0x3613), 0xf7 }, + { CCI_REG8(0x3616), 0x58 }, + { CCI_REG8(0x3619), 0x99 }, + { CCI_REG8(0x361b), 0x60 }, + { CCI_REG8(0x361e), 0x79 }, + { CCI_REG8(0x3634), 0x10 }, + { CCI_REG8(0x3635), 0x10 }, + { CCI_REG8(0x3636), 0x15 }, + { CCI_REG8(0x3646), 0x86 }, + { CCI_REG8(0x364a), 0x0b }, /* Sensor control */ - { 0x3700, 0x17 }, - { 0x3701, 0x22 }, - { 0x3703, 0x10 }, - { 0x370a, 0x37 }, - { 0x3706, 0x63 }, - { 0x3709, 0x3c }, - { 0x370c, 0x30 }, - { 0x3710, 0x24 }, - { 0x3720, 0x28 }, - { 0x3729, 0x7b }, - { 0x372b, 0xbd }, - { 0x372c, 0xbc }, - { 0x372e, 0x52 }, - { 0x373c, 0x0e }, - { 0x373e, 0x33 }, - { 0x3743, 0x10 }, - { 0x3744, 0x88 }, - { 0x3745, 0xc0 }, - { 0x374c, 0x00 }, - { 0x374e, 0x23 }, - { 0x3751, 0x7b }, - { 0x3753, 0xbd }, - { 0x3754, 0xbc }, - { 0x3756, 0x52 }, - { 0x376b, 0x20 }, - { 0x3774, 0x51 }, - { 0x3776, 0xbd }, - { 0x3777, 0xbd }, - { 0x3781, 0x18 }, - { 0x3783, 0x25 }, - { 0x3798, 0x1b }, + { CCI_REG8(0x3700), 0x17 }, + { CCI_REG8(0x3701), 0x22 }, + { CCI_REG8(0x3703), 0x10 }, + { CCI_REG8(0x370a), 0x37 }, + { CCI_REG8(0x3706), 0x63 }, + { CCI_REG8(0x3709), 0x3c }, + { CCI_REG8(0x370c), 0x30 }, + { CCI_REG8(0x3710), 0x24 }, + { CCI_REG8(0x3720), 0x28 }, + { CCI_REG8(0x3729), 0x7b }, + { CCI_REG8(0x372b), 0xbd }, + { CCI_REG8(0x372c), 0xbc }, + { CCI_REG8(0x372e), 0x52 }, + { CCI_REG8(0x373c), 0x0e }, + { CCI_REG8(0x373e), 0x33 }, + { CCI_REG8(0x3743), 0x10 }, + { CCI_REG8(0x3744), 0x88 }, + { CCI_REG8(0x3745), 0xc0 }, + { CCI_REG8(0x374c), 0x00 }, + { CCI_REG8(0x374e), 0x23 }, + { CCI_REG8(0x3751), 0x7b }, + { CCI_REG8(0x3753), 0xbd }, + { CCI_REG8(0x3754), 0xbc }, + { CCI_REG8(0x3756), 0x52 }, + { CCI_REG8(0x376b), 0x20 }, + { CCI_REG8(0x3774), 0x51 }, + { CCI_REG8(0x3776), 0xbd }, + { CCI_REG8(0x3777), 0xbd }, + { CCI_REG8(0x3781), 0x18 }, + { CCI_REG8(0x3783), 0x25 }, + { CCI_REG8(0x3798), 0x1b }, /* Timing control */ - { 0x3801, 0x08 }, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ - { 0x3805, 0x97 }, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ - { 0x380c, 0x0a }, /* TIMING_HTS_H hts[14:8] = 0x0a */ - { 0x380d, 0x0e }, /* TIMING_HTS_L hts[7:0] = 0x0e */ - { 0x3811, 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ - { 0x3813, 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ - { 0x3819, 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ - { 0x3821, 0x06 }, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ + { CCI_REG8(0x3801), 0x08 }, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ + { CCI_REG8(0x3805), 0x97 }, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ + { CCI_REG8(0x380c), 0x0a }, /* TIMING_HTS_H hts[14:8] = 0x0a */ + { CCI_REG8(0x380d), 0x0e }, /* TIMING_HTS_L hts[7:0] = 0x0e */ + { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ + { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ + { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ + { CCI_REG8(0x3821), 0x06 }, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ /* OTP control */ - { 0x3d85, 0x36 }, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, - * OTP_power_up_load_data_enable = 1, - * OTP_bist_select = 1 (compare with zero) - */ - { 0x3d8c, 0x71 }, /* OTP_SETTING_STT_ADDRESS_H */ - { 0x3d8d, 0xcb }, /* OTP_SETTING_STT_ADDRESS_L */ + { CCI_REG8(0x3d85), 0x36 }, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, + * OTP_power_up_load_data_enable = 1, + * OTP_bist_select = 1 (compare with zero) + */ + { CCI_REG8(0x3d8c), 0x71 }, /* OTP_SETTING_STT_ADDRESS_H */ + { CCI_REG8(0x3d8d), 0xcb }, /* OTP_SETTING_STT_ADDRESS_L */ /* BLC registers*/ - { 0x4001, 0x40 }, /* DEBUG_MODE */ - { 0x401b, 0x00 }, /* DEBUG_MODE */ - { 0x401d, 0x00 }, /* DEBUG_MODE */ - { 0x401f, 0x00 }, /* DEBUG_MODE */ - { 0x4020, 0x00 }, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ - { 0x4021, 0x10 }, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ - { 0x4022, 0x07 }, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ - { 0x4023, 0xcf }, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ - { 0x4024, 0x09 }, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ - { 0x4025, 0x60 }, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ - { 0x4026, 0x09 }, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ - { 0x4027, 0x6f }, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ + { CCI_REG8(0x4001), 0x40 }, /* DEBUG_MODE */ + { CCI_REG8(0x401b), 0x00 }, /* DEBUG_MODE */ + { CCI_REG8(0x401d), 0x00 }, /* DEBUG_MODE */ + { CCI_REG8(0x401f), 0x00 }, /* DEBUG_MODE */ + { CCI_REG8(0x4020), 0x00 }, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ + { CCI_REG8(0x4021), 0x10 }, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ + { CCI_REG8(0x4022), 0x07 }, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ + { CCI_REG8(0x4023), 0xcf }, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ + { CCI_REG8(0x4024), 0x09 }, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ + { CCI_REG8(0x4025), 0x60 }, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ + { CCI_REG8(0x4026), 0x09 }, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ + { CCI_REG8(0x4027), 0x6f }, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ /* ADC sync control */ - { 0x4500, 0x6c }, /* ADC_SYNC_CTRL */ - { 0x4503, 0x01 }, /* ADC_SYNC_CTRL */ + { CCI_REG8(0x4500), 0x6c }, /* ADC_SYNC_CTRL */ + { CCI_REG8(0x4503), 0x01 }, /* ADC_SYNC_CTRL */ /* VFIFO */ - { 0x4601, 0xa7 }, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ + { CCI_REG8(0x4601), 0xa7 }, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ /* Temperature monitor */ - { 0x4d00, 0x04 }, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ - { 0x4d01, 0x42 }, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ - { 0x4d02, 0xd1 }, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ - { 0x4d03, 0x93 }, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ - { 0x4d04, 0xf5 }, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ - { 0x4d05, 0xc1 }, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ + { CCI_REG8(0x4d00), 0x04 }, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ + { CCI_REG8(0x4d01), 0x42 }, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ + { CCI_REG8(0x4d02), 0xd1 }, /* TPM_CTRL_02 tpm_offset[31:24] = 0xd1 */ + { CCI_REG8(0x4d03), 0x93 }, /* TPM_CTRL_03 tpm_offset[23:16] = 0x93 */ + { CCI_REG8(0x4d04), 0xf5 }, /* TPM_CTRL_04 tpm_offset[15:8] = 0xf5 */ + { CCI_REG8(0x4d05), 0xc1 }, /* TPM_CTRL_05 tpm_offset[7:0] = 0xc1 */ /* pre-ISP control */ - { 0x5050, 0x0c }, /* DEBUG_MODE */ + { CCI_REG8(0x5050), 0x0c }, /* DEBUG_MODE */ /* OTP-DPC control */ - { 0x5501, 0x10 }, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ - { 0x5503, 0x0f }, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ - { REG_NULL, 0x00 }, + { CCI_REG8(0x5501), 0x10 }, /* OTP_DPC_START_L otp_start_address[7:0] = 0x10 */ + { CCI_REG8(0x5503), 0x0f }, /* OTP_DPC_END_L otp_end_address[7:0] = 0x0f */ }; static const struct ov4689_mode supported_modes[] = { @@ -258,6 +244,7 @@ static const struct ov4689_mode supported_modes[] = { .vts_def = 1554, .pixel_rate = 480000000, .reg_list = ov4689_2688x1520_regs, + .num_regs = ARRAY_SIZE(ov4689_2688x1520_regs), }, }; @@ -310,83 +297,6 @@ static const struct ov4689_gain_range ov4689_gain_ranges[] = { }, }; -/* Write registers up to 4 at a time */ -static int ov4689_write_reg(struct i2c_client *client, u16 reg, u32 len, - u32 val) -{ - u32 buf_i, val_i; - __be32 val_be; - u8 *val_p; - u8 buf[6]; - - if (len > 4) - return -EINVAL; - - buf[0] = reg >> 8; - buf[1] = reg & 0xff; - - val_be = cpu_to_be32(val); - val_p = (u8 *)&val_be; - buf_i = 2; - val_i = 4 - len; - - while (val_i < 4) - buf[buf_i++] = val_p[val_i++]; - - if (i2c_master_send(client, buf, len + 2) != len + 2) - return -EIO; - - return 0; -} - -static int ov4689_write_array(struct i2c_client *client, - const struct regval *regs) -{ - int ret = 0; - u32 i; - - for (i = 0; ret == 0 && regs[i].addr != REG_NULL; i++) - ret = ov4689_write_reg(client, regs[i].addr, - OV4689_REG_VALUE_08BIT, regs[i].val); - - return ret; -} - -/* Read registers up to 4 at a time */ -static int ov4689_read_reg(struct i2c_client *client, u16 reg, unsigned int len, - u32 *val) -{ - __be16 reg_addr_be = cpu_to_be16(reg); - struct i2c_msg msgs[2]; - __be32 data_be = 0; - u8 *data_be_p; - int ret; - - if (len > 4 || !len) - return -EINVAL; - - data_be_p = (u8 *)&data_be; - /* Write register address */ - msgs[0].addr = client->addr; - msgs[0].flags = 0; - msgs[0].len = 2; - msgs[0].buf = (u8 *)®_addr_be; - - /* Read data from register */ - msgs[1].addr = client->addr; - msgs[1].flags = I2C_M_RD; - msgs[1].len = len; - msgs[1].buf = &data_be_p[4 - len]; - - ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); - if (ret != ARRAY_SIZE(msgs)) - return -EIO; - - *val = be32_to_cpu(data_be); - - return 0; -} - static void ov4689_fill_fmt(const struct ov4689_mode *mode, struct v4l2_mbus_framefmt *fmt) { @@ -460,8 +370,8 @@ static int ov4689_enable_test_pattern(struct ov4689 *ov4689, u32 pattern) else val = OV4689_TEST_PATTERN_DISABLE; - return ov4689_write_reg(ov4689->client, OV4689_REG_TEST_PATTERN, - OV4689_REG_VALUE_08BIT, val); + return cci_write(ov4689->regmap, OV4689_REG_TEST_PATTERN, + val, NULL); } static int ov4689_get_selection(struct v4l2_subdev *sd, @@ -505,8 +415,10 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) if (ret < 0) goto unlock_and_return; - ret = ov4689_write_array(ov4689->client, - ov4689->cur_mode->reg_list); + ret = cci_multi_reg_write(ov4689->regmap, + ov4689->cur_mode->reg_list, + ov4689->cur_mode->num_regs, + NULL); if (ret) { pm_runtime_put(&client->dev); goto unlock_and_return; @@ -518,17 +430,15 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) goto unlock_and_return; } - ret = ov4689_write_reg(ov4689->client, OV4689_REG_CTRL_MODE, - OV4689_REG_VALUE_08BIT, - OV4689_MODE_STREAMING); + ret = cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE, + OV4689_MODE_STREAMING, NULL); if (ret) { pm_runtime_put(&client->dev); goto unlock_and_return; } } else { - ov4689_write_reg(ov4689->client, OV4689_REG_CTRL_MODE, - OV4689_REG_VALUE_08BIT, - OV4689_MODE_SW_STANDBY); + cci_write(ov4689->regmap, OV4689_REG_CTRL_MODE, + OV4689_MODE_SW_STANDBY, NULL); pm_runtime_put(&client->dev); } @@ -693,26 +603,16 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_EXPOSURE: /* 4 least significant bits of exposure are fractional part */ - ret = ov4689_write_reg(ov4689->client, OV4689_REG_EXPOSURE, - OV4689_REG_VALUE_24BIT, ctrl->val << 4); + ret = cci_write(ov4689->regmap, OV4689_REG_EXPOSURE, + ctrl->val << 4, NULL); break; case V4L2_CID_ANALOGUE_GAIN: ret = ov4689_map_gain(ov4689, ctrl->val, &sensor_gain); - - ret = ret ?: - ov4689_write_reg(ov4689->client, OV4689_REG_GAIN_H, - OV4689_REG_VALUE_08BIT, - (sensor_gain >> OV4689_GAIN_H_SHIFT) & - OV4689_GAIN_H_MASK); - ret = ret ?: - ov4689_write_reg(ov4689->client, OV4689_REG_GAIN_L, - OV4689_REG_VALUE_08BIT, - sensor_gain & OV4689_GAIN_L_MASK); + cci_write(ov4689->regmap, OV4689_REG_GAIN, sensor_gain, &ret); break; case V4L2_CID_VBLANK: - ret = ov4689_write_reg(ov4689->client, OV4689_REG_VTS, - OV4689_REG_VALUE_16BIT, - ctrl->val + ov4689->cur_mode->height); + ret = cci_write(ov4689->regmap, OV4689_REG_VTS, + ctrl->val + ov4689->cur_mode->height, NULL); break; case V4L2_CID_TEST_PATTERN: ret = ov4689_enable_test_pattern(ov4689, ctrl->val); @@ -817,18 +717,17 @@ static int ov4689_check_sensor_id(struct ov4689 *ov4689, struct i2c_client *client) { struct device *dev = &ov4689->client->dev; - u32 id = 0; + u64 id = 0; int ret; - ret = ov4689_read_reg(client, OV4689_REG_CHIP_ID, - OV4689_REG_VALUE_16BIT, &id); + ret = cci_read(ov4689->regmap, OV4689_REG_CHIP_ID, &id, NULL); if (ret) { dev_err(dev, "Cannot read sensor ID\n"); return ret; } if (id != CHIP_ID) { - dev_err(dev, "Unexpected sensor ID %06x, expected %06x\n", + dev_err(dev, "Unexpected sensor ID %06llx, expected %06x\n", id, CHIP_ID); return -ENODEV; } @@ -938,6 +837,13 @@ static int ov4689_probe(struct i2c_client *client) return -EINVAL; } + ov4689->regmap = devm_cci_regmap_init_i2c(client, 16); + if (IS_ERR(ov4689->regmap)) { + ret = PTR_ERR(ov4689->regmap); + dev_err(dev, "failed to initialize CCI: %d\n", ret); + return ret; + } + ov4689->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(ov4689->reset_gpio)) { From patchwork Tue Apr 16 22:45:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789586 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1265713BAD6; Tue, 16 Apr 2024 22:45:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307541; cv=none; b=N/A3JKHa4LvS91ggXzxMiE/sai1QlLlqYcokbI+vSM4H/J4PeJvlGAZkV6RqlRNiK4pnc52OItdUi8q4lKerLSrjafh5TdfCj+Lb9EjEPn2PlJLnbiC8jY3F929SfrGrWtCJMNwyHmBSbNTcJNgF9ev8Y61cDSgYeR6woyIJoRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307541; c=relaxed/simple; bh=VTXE4UhrTmceY1NPmrJgDEtmUJXENr5T4SfLMtc2i2U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tkMqAxS2AdCfN60SnvNATAlKCO4oG6b0yiqH1lhV5ASd4kF8R6v0AiGo/JwQPaV3nNUtvHQgeu8FHOCsK6gHdLgzMnYjfWpVYWZDxH0xTEfMtFXRqbjYF1N4YvYqCD1bcpVInG1WNpr3TFuiT5lNdvpq85mobF2xYG2ueF8uyNs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QdRVdV8M; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QdRVdV8M" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-516d4d80d00so6143081e87.0; Tue, 16 Apr 2024 15:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307537; x=1713912337; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/vdGgiBkIc5YnTlEo2gOEmdH658ja8P/q71eV02YwcA=; b=QdRVdV8Mv4ta1pMRM4ACeCtNfkgOr2CqGPHaUduwSyJvRhRO8FybrS0KRGRGL93Y2Y CpYeoNjj6k20IVv5kflgLdHkEmAFEzGE/gcZIM6Dnb2HJwjQn36Du3qbMX7aafmevdk8 O1ZtoGAnM0gVbT/+7JFmb6GJVQStNmetJ6ZxO4SA7nYvZWsAfdbDqR24R+x1qrM5HZUe lD2qAdYlLv+jXnyNeLAuxwQu3atAMwofxyrZ9Am+uzfSMx30wtMuimRApXyd5SgZQbVJ fLKzBY/lkTMNuBWp4xqhfuZvFRvYBzBaGc5ruD29mv57e5KASzJ2Tbpkd6yJgvrhTSKm U8tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307537; x=1713912337; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/vdGgiBkIc5YnTlEo2gOEmdH658ja8P/q71eV02YwcA=; b=uqtAo6nQpEgDWyXS0FIfzsS+2bW+9TL+3Jg5TOB5roEG/FKpJTNtqmzpUa/U7WAvhf ngRmVbfDy7uKYcqH/GFLUmlVKzKv+TDv3dmwR3ZPtnkhlhccUnNYzVC9IZjX6Nf/YNqk aQUT3/Ja+q4xWOpWwLtmWYnhP0p5t6ZHP/vtLHtNrDYALp9+KjxJhgHyxJGZU5h517RF vq/JUzH6erm06iULf/b1y7Vk22UW5Ds1oZ5o+wKPwHXMZkjOW6ojKs9h1ryJRpSuOuzl m0NI6tTdECbTsZyacb6fWZeRnqrYM/GHBiX/CpxKG2YMz8DOWPTn1B3i2Fj7ULJYDWTJ Zz4Q== X-Forwarded-Encrypted: i=1; AJvYcCU+OZqLMdt44nMrUVHvYa55rGFoNyZuiD1iYTY+yAOI8isMrgBIerfzawnF9wK5qlUElcFHeyKYDv2du6MUvRWvEVunWZdb7H8BaiOh X-Gm-Message-State: AOJu0Yw8sJmCSlzm2PkQLAvvNlhBLdXCfCfKPyNQdm5QMb8NAjmjgCWp JGyYmsEwRTxYJ/2n9vWiN38PSbe8p8rRKzvvnShNS7qbKkvfOYSodm/aD2HT8YM= X-Google-Smtp-Source: AGHT+IHV3Rl5Kj5X5gq4S1dZsdPwKit3xs05UygSRKauN4NgZtn2MPpbTr1HGc0kC5Cx5tSJEb5wlQ== X-Received: by 2002:ac2:5f1c:0:b0:518:9f1f:8f33 with SMTP id 28-20020ac25f1c000000b005189f1f8f33mr7379150lfq.15.1713307537395; Tue, 16 Apr 2024 15:45:37 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id s12-20020ac2464c000000b00516cea36d5bsm1752857lfo.21.2024.04.16.15.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:36 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko , Kieran Bingham Subject: [PATCH v5 06/16] media: i2c: ov4689: Refactor ov4689_set_ctrl Date: Wed, 17 Apr 2024 01:45:14 +0300 Message-ID: <20240416224524.1511357-7-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce local variable for regmap within the ov4689_set_ctrl function. This adjustment eliminates repetition within the function. Signed-off-by: Mikhail Rudenko Reviewed-by: Kieran Bingham --- drivers/media/i2c/ov4689.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index a3fb6498753f..883dcee52d5f 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -580,10 +580,11 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) { struct ov4689 *ov4689 = container_of(ctrl->handler, struct ov4689, ctrl_handler); + struct regmap *regmap = ov4689->regmap; struct device *dev = ov4689->dev; int sensor_gain; s64 max_expo; - int ret; + int ret = 0; /* Propagate change of current control to all related controls */ switch (ctrl->id) { @@ -603,16 +604,15 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_EXPOSURE: /* 4 least significant bits of exposure are fractional part */ - ret = cci_write(ov4689->regmap, OV4689_REG_EXPOSURE, - ctrl->val << 4, NULL); + cci_write(regmap, OV4689_REG_EXPOSURE, ctrl->val << 4, &ret); break; case V4L2_CID_ANALOGUE_GAIN: ret = ov4689_map_gain(ov4689, ctrl->val, &sensor_gain); - cci_write(ov4689->regmap, OV4689_REG_GAIN, sensor_gain, &ret); + cci_write(regmap, OV4689_REG_GAIN, sensor_gain, &ret); break; case V4L2_CID_VBLANK: - ret = cci_write(ov4689->regmap, OV4689_REG_VTS, - ctrl->val + ov4689->cur_mode->height, NULL); + cci_write(regmap, OV4689_REG_VTS, + ctrl->val + ov4689->cur_mode->height, &ret); break; case V4L2_CID_TEST_PATTERN: ret = ov4689_enable_test_pattern(ov4689, ctrl->val); From patchwork Tue Apr 16 22:45:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789585 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3710413C3D8; Tue, 16 Apr 2024 22:45:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307543; cv=none; b=qDorFraeFahny9gC5Emtq9wDs6RJQ99EziLBhDon8hmZCO2sv8u07CLlgNOqb83n+K7Ty3uSUPzW9otmU+YpMhPgIYpDPWVL/2OJpqcOrmrtyl2oh+Vpmb9/OhrGHDWyPwmudhManTnbpbFWpxdOcPOnc2kuBGIgi1L4PHywBPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307543; c=relaxed/simple; bh=z+qmmXpzq6nTSNsqOsbvOlSNaLFSzRdLB33VDRY6Skc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=epBgSAv9flyfrdcDz8XK/6u0bnGyxiWmsTr+CNI7R9LqxsiL6AI8Le2VOiCIEbUUx6FWleJYQKbzc9tnLsoOl83YTfm0Uy99/s6Hmd570Btsn7py14nfuLs0ljdgg2lJVyLGHFXnLl3MwXFmXJAkn7czWEYLbhKulp4EQ3Zf9cM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GbQVd3vN; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GbQVd3vN" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-518931f8d23so4009748e87.3; Tue, 16 Apr 2024 15:45:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307540; x=1713912340; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v2oCVnQurf2j1hwUUqHHtzxHqRucm9czT99yOLVFDWg=; b=GbQVd3vNIg1GIRr+GokkBsiP2Pr2mjuE7nMfrGtl/WFvDa//o+KDqMtz6EE0KTtVQ3 Dz4+DLcNABEtIps7YPWVXdsmKsH2Fgdx6YZX9L1EyIRRwhLEg8w0KTlj7fnqXar6HigC 94uumbDTETnXbttGbWXo5yR6Nk8GfiY2OldK8zldN5LUDhdx7FeBBUx5a8Yq6SSfFGIK dtuQAkLpPleuczhfAv6g9P22KqFvdiPg8oGmhs85GdwoUHkrYfa13Jxry0XV+FwC/8D7 OnNeJGZKyiX1AsFgTKJfV1W/xFKg5Y4KOWALNx7trekd/6pHs1WgKDmiODCg2Lt90Qge f2NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307540; x=1713912340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v2oCVnQurf2j1hwUUqHHtzxHqRucm9czT99yOLVFDWg=; b=VRnNucS9aa7dYXY7p+k9guixYlrNXy8m00uex+6ClZUaAgggtclLg/iIqaih4DhYbf orcbd7dsuMmtbzk4szoLu3reOE3mCQ6jg7MM8fXyKQ6zSDs3/3P2b3uireczflKpAcpd /k8GSAcTA0PQpok1U4vrN+8mdks0kZlQxOT4Dfuk2OE/dXSm52ZXhId1e/QF0m1wl8+u DttS275P1fAHIh179YFBvhLGBA2LIgHZv/CttPKO/+kzL02EAm+XSRVUPE91ndN9lGCJ O3X0nx9MFhwcRSyKm5lsuwy4wdv9P7HUqmc1VGgDw/KHYqpUhXf3j5dBpGMI9ybXlncT ujUQ== X-Forwarded-Encrypted: i=1; AJvYcCWDrF8vnMrZnXNmFBs4cxb83bH6aceAKiweYt+aDw+MdsiB+JElpBPxeu1r9NkwvjkvhzY9t7NI1wWRPoYL+Kk4XyqC/md3SCgaVAUP X-Gm-Message-State: AOJu0Yx9uz3ZGqxb6NfpHTzPgZ/WEX8AatYgaJLgPWaFZ0GH2hTkl2my MZnH0zSJGIbxWPoO77Fg2vJhx6qhlnGhSG7OHXyctdeG4mBJtawRmjTzx79NH3U= X-Google-Smtp-Source: AGHT+IH9kwj7ikjWf34pW3xaEE45/rQHUi17Cm6yPDrloMLFRuIgWvRzdixVmwKSOnEcbu0ZV5LD0w== X-Received: by 2002:ac2:4e15:0:b0:519:27c3:1b67 with SMTP id e21-20020ac24e15000000b0051927c31b67mr1951572lfr.37.1713307539718; Tue, 16 Apr 2024 15:45:39 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id r7-20020ac25f87000000b00516d0029383sm1751908lfe.28.2024.04.16.15.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:39 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 08/16] media: i2c: ov4689: Enable runtime PM before registering sub-device Date: Wed, 17 Apr 2024 01:45:16 +0300 Message-ID: <20240416224524.1511357-9-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 As the sensor may be accessible right after its async sub-device is registered, enable runtime PM before doing so. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index f0505942000a..ab30d7de5a52 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -875,19 +875,21 @@ static int ov4689_probe(struct i2c_client *client) goto err_clean_entity; } + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + pm_runtime_idle(dev); + ret = v4l2_async_register_subdev_sensor(sd); if (ret) { dev_err(dev, "v4l2 async register subdev failed\n"); - goto err_clean_subdev; + goto err_clean_subdev_pm; } - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - pm_runtime_idle(dev); - return 0; -err_clean_subdev: +err_clean_subdev_pm: + pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); v4l2_subdev_cleanup(sd); err_clean_entity: media_entity_cleanup(&sd->entity); From patchwork Tue Apr 16 22:45:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789584 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0025813C830; Tue, 16 Apr 2024 22:45:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307546; cv=none; b=PsF1ZzsnM3MXjY+JjEH54a0pmAA7Uf0pA6drdVPFcwKAaoX5pBEuT+BFAS1qxfB26PwaNL+DEtpb3uaxdqUi2o1ikrMiY9fEHBj6XopqlDjtRrbYro9U97VLP8f5sbMBQiv0w+q6fZ2MASoaY7+ECWpT15hatrND4Fr4K7rQ8Xo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307546; c=relaxed/simple; bh=K4PLJDc96oGdajL43d4DQTDBd3c8uU2qyB3w9d2ZmVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oMJNc8esXsyPTtLZXb7bJLayefJcKazQ1qd0xUH7vPL7ijOWoYntXlNazx9xRt+MTCeArJkUbqQEIYOJ0Qy4X7T7Q5r3T8nsb8TNaH2YGi0KOJpWjBO2kJ1nVaApsbNk9b7hMTC5E5O4UDkwKC8jmM+BLasX+YECnYwNQv48BeU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AVUKQ4Xo; arc=none smtp.client-ip=209.85.167.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AVUKQ4Xo" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-516d6c1e238so5889572e87.2; Tue, 16 Apr 2024 15:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307543; x=1713912343; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I+BIOfq3ynaR01vX89L5lVtxWYrZ7VGc3tkryXiEmCM=; b=AVUKQ4XoNStUrFzDfk/Ikl65+5qV/XppwpTHSCIfx65/GclknAI2WYJdCmqjZzy+/9 7/PhOyerRuPxHmwI2vO3Ikxudc8qGUuf0SBQOwBXiNnKu7v1eyv2fC4i6qZ57NkzOwMv LaEPaPtMxFTSCOSxNsSfeuhKMcWn2Fp+VL6YGEJ8+iRU04MdTfmBR4UHjA29ap3oIOmQ AFqMqrNHjOp5TTud1f0+02qRi6havTC5Hre0sVEkdDQauDmWJSSGoJYILx5Cxnovqerp hWQBMhjwKvFHMU39jUqP20mT5yoEcTmi1TA/XWah7PmhEF2xzoJLVKyMHnExa8fXE1ab mVKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307543; x=1713912343; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I+BIOfq3ynaR01vX89L5lVtxWYrZ7VGc3tkryXiEmCM=; b=boR5U7LTpCL7pXMLaHO0SI8481Ns5IT0oV8fQ2VGZvWdBiYlmIrl+OBTX+9XULxAV3 0IO24Tdajk2e7lNeucTJCRWUQZ4CKReNh0Kk8d+HF5uOCNCMCfMzw80Afajk3BNEIfn/ 2JsRiyX+jI/4u5FRsS2k8hIbJ9OKL/KJQQeik9MqfyICE8V44eLMHnatJdHhHjzaTAJ5 R8mGcEG/uwX8SnAL+rWwJlQyqB1ABbwHO85Nsmq/tpV8IbLA+Rci4bwlnqIzs3bAw6ol bYYMi+Cxb5LtXjPW3J0MYwpVP11JOiR8QVnMtCcrGBvfdPCFOBC30Lz0qU+F4XpY0bU4 86fQ== X-Forwarded-Encrypted: i=1; AJvYcCWvWUvOld23xe6sK0zSZ1hx2XvjJ91uilsCPPH3sqUFFeWxQSAQv7AgSTQK4PHrWclcQStfs4gbq6CTLFGySGZkl2yeV3kEnLXzaq4k X-Gm-Message-State: AOJu0Yx2EckJDvPhmaFcwQgsX6rJ8QTjx/m1T1vstWH1H48ihpEqRtxl cP2Ww4XImdlPrmlTQU/wNX5+ZMLATuolRkU3lihnMeK/M3FFx0zvSXvGxbaa3r4= X-Google-Smtp-Source: AGHT+IFrdonpuA3ezRfw0gWz+Hl/anAr616WSLB6KxDR86CbrAF7GyGoXp6ryMS2huLpt84nWzPCYQ== X-Received: by 2002:a05:6512:4023:b0:515:cb94:af57 with SMTP id br35-20020a056512402300b00515cb94af57mr11740814lfb.57.1713307542314; Tue, 16 Apr 2024 15:45:42 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id q13-20020ac2514d000000b00515d1dfab34sm1734382lfd.81.2024.04.16.15.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:41 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 10/16] media: i2c: ov4689: Remove max_fps field from struct ov4689_mode Date: Wed, 17 Apr 2024 01:45:18 +0300 Message-ID: <20240416224524.1511357-11-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 max_fps field of struct ov4689_mode is unused in this driver, so remove it. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index 12bd4b010c05..31352838c3ff 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -60,7 +60,6 @@ struct ov4689_mode { enum ov4689_mode_id id; u32 width; u32 height; - u32 max_fps; u32 hts_def; u32 vts_def; u32 exp_def; @@ -237,7 +236,6 @@ static const struct ov4689_mode supported_modes[] = { .sensor_height = 1536, .crop_top = 8, .crop_left = 16, - .max_fps = 30, .exp_def = 1536, .hts_def = 4 * 2574, .vts_def = 1554, From patchwork Tue Apr 16 22:45:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789583 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B86D13CA9E; Tue, 16 Apr 2024 22:45:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307549; cv=none; b=XFHgjRsQDhbT/x/eh4WAPZh9xfaEXaCuzWJ84624OZnQgxm6lEYblD0a3UuKyCguTCPMumyX3m7fe4HiWzLyeBR4CJNgAgRVtPWw6gjNGSD42p3PYFP/o9l+8W8iVQFuP4kvFnE0FMNG7KmIgh26KOqdGqMHHLJAHgZpfY/mFIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307549; c=relaxed/simple; bh=nQLaOOi1m3INUw8IYeGsWUSR1Y5F/FcGFOzChmGZ6gQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qn8amzr+g1+189PlDh9xGwT68gKdSIlaR+g1u9LGY2TvcKmk/JDSnzlIe85y8y/iFzrnHSMMnqb254B8nsGdeGWyN2jZpyHIGjG2VAj7I0J4Lx4wDfB0LGJqRr/m618DjwvLnAL7H4F9tO78kG2CHS+vESrpL3lWpzRmlaE3UWQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hoLxRmHZ; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hoLxRmHZ" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-518f8a69f82so2907013e87.2; Tue, 16 Apr 2024 15:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307545; x=1713912345; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lfYWLG20tWLCctmjoEIlSfMzY43ed7+aAxJ9RfPojYc=; b=hoLxRmHZqBRIgxPvpIdrN7Ba5ct5GH5g+/JS0Vqn2KiT+J/gsTH9LFx5JzHAEdAH1h QM/lc/muiQxfJBZ+lvW/qYIh1mAPGFSAy5ymwscXnDk7Eyx/fU+NjwpNtF3ttWIsuy99 VAwS5rLw3Bm/tDZR7uLH/U6oKyyldN29qu5ohHyUIGiLz+wfz0yIeRM3PjuMjzWGbSkA v9dPN9lO/pg6HPs6ZrBeZrage3vhROlghDoZP7WRikCzb89B3lxilnyjjthmvuBiHZyL qALOyF9L4Y2lzBoSpbCRc+mavJ8A6vcDOgfmOkjJxGRHEx4d3ONg516LF/T/Rp0PteUb EGFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307545; x=1713912345; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lfYWLG20tWLCctmjoEIlSfMzY43ed7+aAxJ9RfPojYc=; b=DggCiFziFVQup3d63kKsynbQTUnLg6j0tFAi7emCfKp4ZJ+r1JXvakGzzgjrwcJeqE 1/OXqK8AhUK8GryTGQsKLlSC3ZzsmeoQ1q+sdagTsJMZhDnHwyfnmoUArXJnJe1P/epR ZlQC08V2epkOVuwY4PRDugYaH8i2g0+cq8bTehwDlrXJbqtGHuimft+p/ZSAI+iwHQ61 YAtl7pzWvVRuFmQyYMzeBk0As2ss1A70T8uKCzwuTtOFxbKngp8EHm/s7WZRvhAYmF0O 3X5HDuIwjdK1EKrKKS48IyrK3s3Be1qCRKplBs9S8e/4EiAInkQtXYk9W5VcBYNZXUpt XZqg== X-Forwarded-Encrypted: i=1; AJvYcCWfU8nfmkE7lor0HPF+4c/nh/gMjfekhQ0gJgSAaSE0Q+oH8Ul4GPbLsXPt0WL9feo1SvyUZnpTL+ZPgIsT0Iy8v3aVi6Npw2DVkNQN X-Gm-Message-State: AOJu0YxBFSx4swRn+WO6sClxuTaMi1AKfKVLj3F1a/h3Xaeo5OgRj7W/ kD8Y5ZOtTzrtZdgyF+OSmaEbjHwamrAUv7Bhx5VmS7bmPTwg1bXmQhdjtmWyPKs= X-Google-Smtp-Source: AGHT+IEk405u1zD+q0VmGL18rrASDlrBdHE//jacygoJwwtu7sDabFy7W31Z/oko/GplGnhEvniKRw== X-Received: by 2002:a19:7510:0:b0:518:c7e5:d1ba with SMTP id y16-20020a197510000000b00518c7e5d1bamr5931604lfe.63.1713307545291; Tue, 16 Apr 2024 15:45:45 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id y5-20020a196405000000b00515d407aaa0sm1756270lfb.252.2024.04.16.15.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:44 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko , Kieran Bingham Subject: [PATCH v5 12/16] media: i2c: ov4689: Implement vflip/hflip controls Date: Wed, 17 Apr 2024 01:45:20 +0300 Message-ID: <20240416224524.1511357-13-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The OV4689 sensor supports horizontal and vertical flipping. Add appropriate controls to the driver. Toggling both array flip and digital flip bits allows to achieve flipping while maintaining output Bayer order. Note that the default value of hflip control corresponds to both bits set, as it was before this patch. Signed-off-by: Mikhail Rudenko Reviewed-by: Kieran Bingham --- drivers/media/i2c/ov4689.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index e478c1f7a8c2..aed87a1b6141 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -42,6 +42,14 @@ #define OV4689_REG_VTS CCI_REG16(0x380e) #define OV4689_VTS_MAX 0x7fff +#define OV4689_REG_TIMING_FORMAT1 CCI_REG8(0x3820) /* Vertical */ +#define OV4689_REG_TIMING_FORMAT2 CCI_REG8(0x3821) /* Horizontal */ +#define OV4689_TIMING_FLIP_MASK GENMASK(2, 1) +#define OV4689_TIMING_FLIP_ARRAY BIT(1) +#define OV4689_TIMING_FLIP_DIGITAL BIT(2) +#define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ + OV4689_TIMING_FLIP_DIGITAL) + #define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040) #define OV4689_TEST_PATTERN_ENABLE 0x80 #define OV4689_TEST_PATTERN_DISABLE 0x0 @@ -183,7 +191,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ - { CCI_REG8(0x3821), 0x06 }, /* TIMING_FORMAT2 array_h_mirror = 1, digital_h_mirror = 1 */ /* OTP control */ { CCI_REG8(0x3d85), 0x36 }, /* OTP_REG85 OTP_power_up_load_setting_enable = 1, @@ -607,6 +614,16 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) (ctrl->val + ov4689->cur_mode->width) / OV4689_HTS_DIVIDER, &ret); break; + case V4L2_CID_VFLIP: + cci_update_bits(regmap, OV4689_REG_TIMING_FORMAT1, + OV4689_TIMING_FLIP_MASK, + ctrl->val ? OV4689_TIMING_FLIP_BOTH : 0, &ret); + break; + case V4L2_CID_HFLIP: + cci_update_bits(regmap, OV4689_REG_TIMING_FORMAT2, + OV4689_TIMING_FLIP_MASK, + ctrl->val ? 0 : OV4689_TIMING_FLIP_BOTH, &ret); + break; default: dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n", __func__, ctrl->id, ctrl->val); @@ -637,7 +654,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) handler = &ov4689->ctrl_handler; mode = ov4689->cur_mode; - ret = v4l2_ctrl_handler_init(handler, 10); + ret = v4l2_ctrl_handler_init(handler, 12); if (ret) return ret; @@ -677,6 +694,9 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) ARRAY_SIZE(ov4689_test_pattern_menu) - 1, 0, 0, ov4689_test_pattern_menu); + v4l2_ctrl_new_std(handler, &ov4689_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0); + v4l2_ctrl_new_std(handler, &ov4689_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0); + if (handler->error) { ret = handler->error; dev_err(ov4689->dev, "Failed to init controls(%d)\n", ret); From patchwork Tue Apr 16 22:45:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789582 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFEF313D291; Tue, 16 Apr 2024 22:45:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307551; cv=none; b=GaFYhBbavKeG1EGmqAocm4ikQxSiIZgE5s+OM/4xY7mCdmwTJ76AqI7+pLtbZqMVf9yRMvWlfC1EWccG6HCcqce4eEd6u5qDaQaPun/3k6ipnZhetNQcdqkBXRC9FTH0oKwALGtrSiKnOLd3cQxZhJ6kL72+JBMOD+TK0edPEo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307551; c=relaxed/simple; bh=DtVUHIfAgevKu4djLbP7nqbfz3fagvRXoPG1r681QNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VmUqNlfatmNl84Fm6+4zrmG4F45GDUXVyZs1N65hiTWwkeFykxgc6HEDxjzOZc+r45QdBSC7EZKEBOSGulElSkjCU3Z8bZQHPxMnWEniI3ZrZKgXlfC9wH5yhc8RyniUHXfdazIeObiSaCFQfZ9jbx9tDxDT1i0pTpjREFcTcio= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mLBSAdZe; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mLBSAdZe" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2d715638540so59384901fa.3; Tue, 16 Apr 2024 15:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307547; x=1713912347; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XnB6EJezC8uEYf8UpSPwf0QVKtD7oJuVnHfWXzU0FRs=; b=mLBSAdZeaEEWs13K8yqif38Rvhqg1EWfLABzZAN/6zE60oXNYTuse6R1Dsmzgse6BE rLiTTBfSO8V40/TUCXnnvXVt/fcmUwyLe7v0NKRYR7jIBQlRjf5uc+Obb6PudznF/j+D vYiCEsOoeaBWKtZ4ny3rncn7aiAsgoLDt6Xui52KktorRfY6NuUp1oqhU4n8e61i2i5c B05eyrJnnnzFVDkClkHTqIHFii4BsMWnvqjI66+XN6jMfi22RlR7TITqTiZ0obruY8sI nDy6Qlmz6dF52ze8BliW3/ktId6coe1ZKOsS2aQ1w/Is07q8Oq7YFir/FL6X0lE1pEcK X8/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307547; x=1713912347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XnB6EJezC8uEYf8UpSPwf0QVKtD7oJuVnHfWXzU0FRs=; b=Su1nAY1+/gfbWFTLl1/nMppPxNC3BFMbU+uhwFkRNqBOp/et9VcuoDDM1A1Sb7ofVH udKg991BKx6wbpWe5Hc9U+h4n9JNDmy6SU50xTJmZ5Kv4LNQTbjmfiNjSDrjAcnKvmE+ L3YWNcMzUI60bci/4HoUCHsmti1MfFndN/WGxS4iRsUG+Di0j2yUnPCIHj40uvLhDJ57 XxOr+J96Cxu79Yms4ciOdZHpnADrobeTVbmLc6MjXYeFrv7pUhpiXLprOQPW6+BVH8nV CyUPgMK9wrz4jlTTAaMmayzMfYIxn472JSN4lh+ldcNtRxZtC5zC47cLLt6MW/laUF9J HJKA== X-Forwarded-Encrypted: i=1; AJvYcCV8KXNOoNs8GA31FpTaN+TLkqrDaSqSYslKLw414+ufJMDSfyu+1UZO9bVn4tPwA/tT1dREe5Un1L72FQrM3pynjdIbjt1zEQvIltTa X-Gm-Message-State: AOJu0Yz8OL5WByIDXY3jf0Ewd3pJ4DgHey2vNck2ck5QS+IIxxSHHyG+ wa7/dnapQS1rPkNcQQ1rDKY2FG2YM5FBKgf6lfUWTc0c6+MDjiV040bP5eVnayk= X-Google-Smtp-Source: AGHT+IEvriP6sQBlcmr+Hy9a6IM5os+FLPMPiuFDW+kvAJIgTO/WULr1+E+BcVf2XnlMz5gB5u56TA== X-Received: by 2002:a05:651c:1254:b0:2d4:77c0:d61c with SMTP id h20-20020a05651c125400b002d477c0d61cmr8709506ljh.35.1713307547087; Tue, 16 Apr 2024 15:45:47 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id y1-20020a2e95c1000000b002d2d1c11703sm1704617ljh.76.2024.04.16.15.45.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:46 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 14/16] media: i2c: ov4689: Implement manual color balance controls Date: Wed, 17 Apr 2024 01:45:22 +0300 Message-ID: <20240416224524.1511357-15-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The OV4689 sensor has separate red and blue gain settings (up to 4x). Implement appropriate controls in the driver. Default gain values are not modified. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index 9419fc4de33e..81153b1a49a5 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -56,6 +56,13 @@ #define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ OV4689_TIMING_FLIP_DIGITAL) +#define OV4689_REG_WB_GAIN_RED CCI_REG16(0x500c) +#define OV4689_REG_WB_GAIN_BLUE CCI_REG16(0x5010) +#define OV4689_WB_GAIN_MIN 1 +#define OV4689_WB_GAIN_MAX 0xfff +#define OV4689_WB_GAIN_STEP 1 +#define OV4689_WB_GAIN_DEFAULT 0x400 + #define OV4689_REG_TEST_PATTERN CCI_REG8(0x5040) #define OV4689_TEST_PATTERN_ENABLE 0x80 #define OV4689_TEST_PATTERN_DISABLE 0x0 @@ -632,6 +639,12 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_DIGITAL_GAIN: cci_write(regmap, OV4689_REG_DIG_GAIN, ctrl->val, &ret); break; + case V4L2_CID_RED_BALANCE: + cci_write(regmap, OV4689_REG_WB_GAIN_RED, ctrl->val, &ret); + break; + case V4L2_CID_BLUE_BALANCE: + cci_write(regmap, OV4689_REG_WB_GAIN_BLUE, ctrl->val, &ret); + break; default: dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n", __func__, ctrl->id, ctrl->val); @@ -662,7 +675,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) handler = &ov4689->ctrl_handler; mode = ov4689->cur_mode; - ret = v4l2_ctrl_handler_init(handler, 13); + ret = v4l2_ctrl_handler_init(handler, 15); if (ret) return ret; @@ -709,6 +722,14 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689) OV4689_DIG_GAIN_MIN, OV4689_DIG_GAIN_MAX, OV4689_DIG_GAIN_STEP, OV4689_DIG_GAIN_DEFAULT); + v4l2_ctrl_new_std(handler, &ov4689_ctrl_ops, V4L2_CID_RED_BALANCE, + OV4689_WB_GAIN_MIN, OV4689_WB_GAIN_MAX, + OV4689_WB_GAIN_STEP, OV4689_WB_GAIN_DEFAULT); + + v4l2_ctrl_new_std(handler, &ov4689_ctrl_ops, V4L2_CID_BLUE_BALANCE, + OV4689_WB_GAIN_MIN, OV4689_WB_GAIN_MAX, + OV4689_WB_GAIN_STEP, OV4689_WB_GAIN_DEFAULT); + if (handler->error) { ret = handler->error; dev_err(ov4689->dev, "Failed to init controls(%d)\n", ret); From patchwork Tue Apr 16 22:45:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Rudenko X-Patchwork-Id: 789581 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E80A13E052; Tue, 16 Apr 2024 22:45:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307554; cv=none; b=qA4QdQGppCJgm4qKa53gCWbwQgnbCIJ6ATXI1GbfFNhPFNRY433bG/vPy6ENKzmnGg6ABpGMAHtzqDha/SoXjSaxY04T/EddL7xb1Thrbbn85oOJadC9Piou4vTXWCW/++pRMEhBlLPTR4oeWrqpN+aqQngF5SJSX9wPwSnoO5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713307554; c=relaxed/simple; bh=fpjcBYWKI7/oU2A5MYkdaQS7my7qviwEtb9hhcIwAKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kxFeOUK0LI2KyhoKG3QJ3v57TWYnt7baleisRQUk2BIBnEO+8YdiTfU5wa2VX1vMnL5/nWmfFcXCMHUzwIZF7fDqBQt8AphX5HoCrQLAsb3KoyZz+kg130CrcUjCGxttzfj8U2aahlpaqRyesXs+DsgbvvNuEPnWCeWee4NReGc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CJvw7l9U; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CJvw7l9U" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-518c9ff3e29so3592674e87.0; Tue, 16 Apr 2024 15:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713307550; x=1713912350; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6WTz6RxNbzEeUZHtBYgSuV5IA4nML2YqNqY1OSaSBE4=; b=CJvw7l9U/paOx4tnDJPccXphixbSR6aEJBRAVyGk/1xvedQ8uy3IX5ki1Btr++YISR NR+NeVWdxXxRGlRjAEn99Dwp1kYuR1QDIvzTE7Bq9EI277hn04bmx+gr85LsTB43+BdX LfsuK7ZFnt6UlQ3MO3wTl34CRWzFxISY9tZEojJaGs5oQBK9OTRoR91EsLRBYFIQ9EZ2 UqJ82uJr4jQxCeZwcDTaiKKu4G5qo4c8sjJwNq49SkBUhOd2g9ZR5KSPJe5G9Q+B2iuV CWd3qRpXP8xq72Xy6QOVkSD0afvr4I2QVirBadowiCj7gGv9KtmJ0zlw2ypFF8Ct/ZUV eo7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713307550; x=1713912350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6WTz6RxNbzEeUZHtBYgSuV5IA4nML2YqNqY1OSaSBE4=; b=dfCZGpOzl6aZGQs0eLix1aqyFTuVllRvMJky037WxDZaCU7EUkm8zwsb6M7zyVL3fO XtM9VIsNuf4bOxjJSC4Vyc0GoD4qtvPgk4mDm002bZWB9mbIKTo3W6r544OJOuiYNllu p49L6G36AW0lecfGa1+WMJFLb7HO97S3BDXOOqR7dnP3cxq6Nmoa3Bg3uElL1GU81gNz sX/4FHf1d4bUebuszd9B3jNOIOoTb2Lhn7KdDpAiEL9+cuZSmf07W1QxzftOWxBysOyz jpIxjSTi46/HwOAjR3kH7qWTIKjASkKwjh+aFzA/lSXDl5q2Zu6mbfdSgV5Q1PxtcR+6 YX5Q== X-Forwarded-Encrypted: i=1; AJvYcCVm88chDLDbx4+/mCZbu8Us3l6VA6UkVccWJ8WMqa0mnFQrewDtdMxFdTcXQEWMq80vgmNH8LfJcfwMXCfOH81DpDnH5z2/eWSVa8hl X-Gm-Message-State: AOJu0YwANfmJkdjXuUn2+q8eNygeDlQzPyW7ahID2ZppRtgfMsItiGk4 1SUh+R8mBohpRgsLcrohvOwvOd13let4qB1NcD54xiShx2i03XE6DQm16BIhK1A= X-Google-Smtp-Source: AGHT+IFRQeiSrlNFBGze9bikBICwT+4Be4weNOJX+RPDCnHjz0mCwy8ltjNBBbW+oNSi07Q9ph7pYQ== X-Received: by 2002:a05:6512:3b98:b0:518:fb01:448e with SMTP id g24-20020a0565123b9800b00518fb01448emr4984114lfv.57.1713307549892; Tue, 16 Apr 2024 15:45:49 -0700 (PDT) Received: from localhost (95-24-153-47.broadband.corbina.ru. [95.24.153.47]) by smtp.gmail.com with ESMTPSA id eq9-20020a056512488900b00518c3eb3a9csm981831lfb.309.2024.04.16.15.45.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 15:45:49 -0700 (PDT) From: Mikhail Rudenko To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sakari Ailus , Laurent Pinchart , Jacopo Mondi , Tommaso Merciai , Christophe JAILLET , Dave Stevenson , Mauro Carvalho Chehab , Mikhail Rudenko Subject: [PATCH v5 16/16] media: i2c: ov4689: Set timing registers programmatically Date: Wed, 17 Apr 2024 01:45:24 +0300 Message-ID: <20240416224524.1511357-17-mike.rudenko@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240416224524.1511357-1-mike.rudenko@gmail.com> References: <20240416224524.1511357-1-mike.rudenko@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Set timing-related and BLC anchor registers via cci calls instead of hardcoding them in the register table. This prepares the driver for implementation of configurable analogue crop and binning. No functional change intended. Signed-off-by: Mikhail Rudenko Reviewed-by: Laurent Pinchart --- drivers/media/i2c/ov4689.c | 83 +++++++++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c index 9da4f84e63b1..0c623d43c0ad 100644 --- a/drivers/media/i2c/ov4689.c +++ b/drivers/media/i2c/ov4689.c @@ -41,6 +41,13 @@ #define OV4689_DIG_GAIN_STEP 1 #define OV4689_DIG_GAIN_DEFAULT 0x800 +#define OV4689_REG_H_CROP_START CCI_REG16(0x3800) +#define OV4689_REG_V_CROP_START CCI_REG16(0x3802) +#define OV4689_REG_H_CROP_END CCI_REG16(0x3804) +#define OV4689_REG_V_CROP_END CCI_REG16(0x3806) +#define OV4689_REG_H_OUTPUT_SIZE CCI_REG16(0x3808) +#define OV4689_REG_V_OUTPUT_SIZE CCI_REG16(0x380a) + #define OV4689_REG_HTS CCI_REG16(0x380c) #define OV4689_HTS_DIVIDER 4 #define OV4689_HTS_MAX 0x7fff @@ -48,6 +55,9 @@ #define OV4689_REG_VTS CCI_REG16(0x380e) #define OV4689_VTS_MAX 0x7fff +#define OV4689_REG_H_WIN_OFF CCI_REG16(0x3810) +#define OV4689_REG_V_WIN_OFF CCI_REG16(0x3812) + #define OV4689_REG_TIMING_FORMAT1 CCI_REG8(0x3820) /* Vertical */ #define OV4689_REG_TIMING_FORMAT2 CCI_REG8(0x3821) /* Horizontal */ #define OV4689_TIMING_FLIP_MASK GENMASK(2, 1) @@ -56,6 +66,17 @@ #define OV4689_TIMING_FLIP_BOTH (OV4689_TIMING_FLIP_ARRAY |\ OV4689_TIMING_FLIP_DIGITAL) +#define OV4689_REG_ANCHOR_LEFT_START CCI_REG16(0x4020) +#define OV4689_ANCHOR_LEFT_START_DEF 576 +#define OV4689_REG_ANCHOR_LEFT_END CCI_REG16(0x4022) +#define OV4689_ANCHOR_LEFT_END_DEF 831 +#define OV4689_REG_ANCHOR_RIGHT_START CCI_REG16(0x4024) +#define OV4689_ANCHOR_RIGHT_START_DEF 1984 +#define OV4689_REG_ANCHOR_RIGHT_END CCI_REG16(0x4026) +#define OV4689_ANCHOR_RIGHT_END_DEF 2239 + +#define OV4689_REG_VFIFO_CTRL_01 CCI_REG8(0x4601) + #define OV4689_REG_WB_GAIN_RED CCI_REG16(0x500c) #define OV4689_REG_WB_GAIN_BLUE CCI_REG16(0x5010) #define OV4689_WB_GAIN_MIN 1 @@ -199,10 +220,6 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x3798), 0x1b }, /* Timing control */ - { CCI_REG8(0x3801), 0x08 }, /* H_CROP_START_L h_crop_start[7:0] = 0x08 */ - { CCI_REG8(0x3805), 0x97 }, /* H_CROP_END_L h_crop_end[7:0] = 0x97 */ - { CCI_REG8(0x3811), 0x08 }, /* H_WIN_OFF_L h_win_off[7:0] = 0x08*/ - { CCI_REG8(0x3813), 0x04 }, /* V_WIN_OFF_L v_win_off[7:0] = 0x04 */ { CCI_REG8(0x3819), 0x01 }, /* VSYNC_END_L vsync_end_point[7:0] = 0x01 */ /* OTP control */ @@ -218,22 +235,11 @@ static const struct cci_reg_sequence ov4689_2688x1520_regs[] = { { CCI_REG8(0x401b), 0x00 }, /* DEBUG_MODE */ { CCI_REG8(0x401d), 0x00 }, /* DEBUG_MODE */ { CCI_REG8(0x401f), 0x00 }, /* DEBUG_MODE */ - { CCI_REG8(0x4020), 0x00 }, /* ANCHOR_LEFT_START_H anchor_left_start[11:8] = 0 */ - { CCI_REG8(0x4021), 0x10 }, /* ANCHOR_LEFT_START_L anchor_left_start[7:0] = 0x10 */ - { CCI_REG8(0x4022), 0x07 }, /* ANCHOR_LEFT_END_H anchor_left_end[11:8] = 0x07 */ - { CCI_REG8(0x4023), 0xcf }, /* ANCHOR_LEFT_END_L anchor_left_end[7:0] = 0xcf */ - { CCI_REG8(0x4024), 0x09 }, /* ANCHOR_RIGHT_START_H anchor_right_start[11:8] = 0x09 */ - { CCI_REG8(0x4025), 0x60 }, /* ANCHOR_RIGHT_START_L anchor_right_start[7:0] = 0x60 */ - { CCI_REG8(0x4026), 0x09 }, /* ANCHOR_RIGHT_END_H anchor_right_end[11:8] = 0x09 */ - { CCI_REG8(0x4027), 0x6f }, /* ANCHOR_RIGHT_END_L anchor_right_end[7:0] = 0x6f */ /* ADC sync control */ { CCI_REG8(0x4500), 0x6c }, /* ADC_SYNC_CTRL */ { CCI_REG8(0x4503), 0x01 }, /* ADC_SYNC_CTRL */ - /* VFIFO */ - { CCI_REG8(0x4601), 0xa7 }, /* VFIFO_CTRL_01 r_vfifo_read_start[7:0] = 0xa7 */ - /* Temperature monitor */ { CCI_REG8(0x4d00), 0x04 }, /* TPM_CTRL_00 tmp_slope[15:8] = 0x04 */ { CCI_REG8(0x4d01), 0x42 }, /* TPM_CTRL_01 tmp_slope[7:0] = 0x42 */ @@ -406,6 +412,41 @@ static int ov4689_get_selection(struct v4l2_subdev *sd, return -EINVAL; } +static int ov4689_setup_timings(struct ov4689 *ov4689) +{ + const struct ov4689_mode *mode = ov4689->cur_mode; + struct regmap *rm = ov4689->regmap; + int ret = 0; + + cci_write(rm, OV4689_REG_H_CROP_START, 8, &ret); + cci_write(rm, OV4689_REG_V_CROP_START, 8, &ret); + cci_write(rm, OV4689_REG_H_CROP_END, 2711, &ret); + cci_write(rm, OV4689_REG_V_CROP_END, 1531, &ret); + + cci_write(rm, OV4689_REG_H_OUTPUT_SIZE, mode->width, &ret); + cci_write(rm, OV4689_REG_V_OUTPUT_SIZE, mode->height, &ret); + + cci_write(rm, OV4689_REG_H_WIN_OFF, 8, &ret); + cci_write(rm, OV4689_REG_V_WIN_OFF, 4, &ret); + + cci_write(rm, OV4689_REG_VFIFO_CTRL_01, 167, &ret); + + return ret; +} + +static int ov4689_setup_blc_anchors(struct ov4689 *ov4689) +{ + struct regmap *rm = ov4689->regmap; + int ret = 0; + + cci_write(rm, OV4689_REG_ANCHOR_LEFT_START, 16, &ret); + cci_write(rm, OV4689_REG_ANCHOR_LEFT_END, 1999, &ret); + cci_write(rm, OV4689_REG_ANCHOR_RIGHT_START, 2400, &ret); + cci_write(rm, OV4689_REG_ANCHOR_RIGHT_END, 2415, &ret); + + return ret; +} + static int ov4689_s_stream(struct v4l2_subdev *sd, int on) { struct ov4689 *ov4689 = to_ov4689(sd); @@ -429,6 +470,18 @@ static int ov4689_s_stream(struct v4l2_subdev *sd, int on) goto unlock_and_return; } + ret = ov4689_setup_timings(ov4689); + if (ret) { + pm_runtime_put(dev); + goto unlock_and_return; + } + + ret = ov4689_setup_blc_anchors(ov4689); + if (ret) { + pm_runtime_put(dev); + goto unlock_and_return; + } + ret = __v4l2_ctrl_handler_setup(&ov4689->ctrl_handler); if (ret) { pm_runtime_put(dev);