From patchwork Tue Feb 25 13:08:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 868351 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C211268FE9; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; cv=none; b=IPbKoE+fExo91+qz5jqXo31iJYry2IPn9EJz33I9PFIKgpOcP8CG7uVpJkNFlDymqZnI9XRRxmTYib6EBLknkl7oXbGqX3sCSzJnzxlGiM4RX1pV5pQXtHEtUfpB9eSr7QyVKMhBheH6cL2Y6/+HT4y1qA0eRuXXVTyyif3X0vY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; c=relaxed/simple; bh=mJB3OeO7yxJLnmoNvPHcVDUdgqbN6kyIO0TWpaVm7Sk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MQ/NH94uuExvQnFkKwiz8Ay0exPNJVQHLkxShJjByOXDuRI5GtVNVFobCXwBxYkDQoTm7X6SdsSCpSafKkGfgYCj8WlPjRP5ypphp+AzVbci7G4ZAlFGYHsnBAXKxmtFg64kzk1xCtkZzg/iqV2TjfJIW+EjQi3GCLeKA7lLQoo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=qVR6OBsU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="qVR6OBsU" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1C738C4CEE6; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1740488959; bh=mJB3OeO7yxJLnmoNvPHcVDUdgqbN6kyIO0TWpaVm7Sk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qVR6OBsU5wfkltOwG+5xj+yu8BAwyBz3Bdx3Uqe05vq27aJ1cK/DsxceY4mHVh6TS Qh3+O1snPoO7K4uxUybfAND5IVZHOUwC/oTdM1uuhW9tmvyPFnDWjwesEKEhAEbNLT m0CJ1IGZplajMfxPW9S6pfn6F2sPP/CAtbD91aqM= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED58FC021B2; Tue, 25 Feb 2025 13:09:18 +0000 (UTC) From: Richard Leitner Date: Tue, 25 Feb 2025 14:08:40 +0100 Subject: [PATCH 1/3] media: i2c: ov9282: use register definitions Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b4-ov9282-gain-v1-1-a24af2820dde@linux.dev> References: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> In-Reply-To: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740488957; l=1452; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=mJB3OeO7yxJLnmoNvPHcVDUdgqbN6kyIO0TWpaVm7Sk=; b=KwJ/U+DQUyz7ELVGsgLc1ocM+cs3un14JD1rk6kPXywBfpHDvZJR25YOhrFecZc8jmbbA2RFs xfW0rTF4l9nDnottl1hg7hd9OZl/DVjcdwaQiX0IcWjlk+G0/6+WZHY X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 For better readability use already available register definitions in hard-coded common and mode register structs. Signed-off-by: Richard Leitner Reviewed-by: Dave Stevenson --- drivers/media/i2c/ov9282.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index 87e5d7ce5a47ee23a721ea39c0ab314c6fca6007..c926842257893c4da3319b847fab9908b5bdaec6 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -296,8 +296,8 @@ static const struct ov9282_reg mode_1280x800_regs[] = { {0x3813, 0x08}, {0x3814, 0x11}, {0x3815, 0x11}, - {0x3820, 0x40}, - {0x3821, 0x00}, + {OV9282_REG_TIMING_FORMAT_1, 0x40}, + {OV9282_REG_TIMING_FORMAT_2, 0x00}, {0x4003, 0x40}, {0x4008, 0x04}, {0x4009, 0x0b}, @@ -327,8 +327,8 @@ static const struct ov9282_reg mode_1280x720_regs[] = { {0x3813, 0x08}, {0x3814, 0x11}, {0x3815, 0x11}, - {0x3820, 0x3c}, - {0x3821, 0x84}, + {OV9282_REG_TIMING_FORMAT_1, 0x3c}, + {OV9282_REG_TIMING_FORMAT_2, 0x84}, {0x4003, 0x40}, {0x4008, 0x02}, {0x4009, 0x05}, @@ -358,8 +358,8 @@ static const struct ov9282_reg mode_640x400_regs[] = { {0x3813, 0x04}, {0x3814, 0x31}, {0x3815, 0x22}, - {0x3820, 0x60}, - {0x3821, 0x01}, + {OV9282_REG_TIMING_FORMAT_1, 0x60}, + {OV9282_REG_TIMING_FORMAT_2, 0x01}, {0x4008, 0x02}, {0x4009, 0x05}, {0x400c, 0x00}, From patchwork Tue Feb 25 13:08:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 868808 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C0A2268FCD; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; cv=none; b=JoHIwU0UWY/XTIgNqIWrf/g4ku5Oiin9v9hKowoBkJZ05OqGM8WzNXjXhefI60yNIAxw9/43yFoFN1eV0X6RXEpdzpcGr4EAqoFS1f60aZYrUv3LddyRYVvyXkp9mRUigZvdXqr2kQq3P3aHh7QLspulF49DP9Wy+VBUvuVNanw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; c=relaxed/simple; bh=0V1L6sP8vB21+gdfkiLRWy2BgxHEUONyy6cQBO3kICc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q6GydqoE4jqwlkMQzYy94woB1Yk6WpibhCXAVPJcej/TWZ6Mo1FhYaq1HcHN448XmNUbHwcOS8xBwJMO1CyGLic/4s7zPbXQM3LCXl+W1IEXSMWwCxpDIA+OfT387Vq6wjC42oDtHOzqa+QL7rbsOeiRQduPaHhNRFd9lELcA8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=2QI8sZTz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="2QI8sZTz" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2829AC4CEEA; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1740488959; bh=0V1L6sP8vB21+gdfkiLRWy2BgxHEUONyy6cQBO3kICc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=2QI8sZTzUnFZ7dr4Q2L2c50ohreg8iFWnE4lqxxjQZpJR/avUg1mGLQKWbHPiD/W+ AHYIYJI96AMGRtt6fr8R57vFwVfzsm6Nz2j33Y/m2+Z3FfUMgCfuZhzTIHOGVsiR41 P6UUPU7HL3PXMVQkjk9Rw4D1gRlhQ3LZDjhaZ6zg= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11D86C021BC; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) From: Richard Leitner Date: Tue, 25 Feb 2025 14:08:41 +0100 Subject: [PATCH 2/3] media: i2c: ov9282: add AEC Manual register definition Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b4-ov9282-gain-v1-2-a24af2820dde@linux.dev> References: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> In-Reply-To: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740488957; l=1395; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=0V1L6sP8vB21+gdfkiLRWy2BgxHEUONyy6cQBO3kICc=; b=yj6uHHm+94J4ghnUEWM6JwZOohXI11I/NXqPMuxTt7FGq2sELE3AbEu8DvcPO4ZjRaauCzc// ZDim+VzxNYKC2iHZPhLixbeb28F9ZaiLNQM0+SnKbTApIwyDmVZcqpf X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 Add #define's for the "AEC MANUAL" (0x3503) register and its values/flags. Use those in the registers single usage within the `common_regs` struct. All values are based on the OV9281 datasheet v1.01 (09.18.2015). Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index c926842257893c4da3319b847fab9908b5bdaec6..c882a021cf18852237bf9b9524d3de0c5b48cbcb 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -44,6 +44,15 @@ #define OV9282_EXPOSURE_STEP 1 #define OV9282_EXPOSURE_DEFAULT 0x0282 +/* AEC/AGC manual */ +#define OV9282_REG_AEC_MANUAL 0x3503 +#define OV9282_DIGFRAC_GAIN_DELAY BIT(6) +#define OV9282_GAIN_CHANGE_DELAY BIT(5) +#define OV9282_GAIN_DELAY BIT(4) +#define OV9282_GAIN_PREC16_EN BIT(3) +#define OV9282_GAIN_MANUAL_AS_SENSGAIN BIT(2) +#define OV9282_AEC_MANUAL_DEFAULT 0x00 + /* Analog gain control */ #define OV9282_REG_AGAIN 0x3509 #define OV9282_AGAIN_MIN 0x10 @@ -214,7 +223,7 @@ static const struct ov9282_reg common_regs[] = { {0x3030, 0x10}, {0x3039, 0x32}, {0x303a, 0x00}, - {0x3503, 0x08}, + {OV9282_REG_AEC_MANUAL, OV9282_GAIN_PREC16_EN}, {0x3505, 0x8c}, {0x3507, 0x03}, {0x3508, 0x00}, From patchwork Tue Feb 25 13:08:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Leitner X-Patchwork-Id: 868807 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C119268FD9; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; cv=none; b=skv52FIRdVCnqYfxc6K4Jay1O01x15++0eDjP+wX1Q+/PbrJDnAfGlJ+I8fMLQbp0ETa+3AYIhU6WaAiQEk7q39P5kgkocJswz3FcFqGbjQda6lQt70kpnswnLMJtn+Jsy3LuIlIxojObsauFuaKn59uE9Vwsciy2S1valMvV6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740488959; c=relaxed/simple; bh=KF5ZO6ejS0ACndO4NFjdXXOOXXaUCY9pfvk3vfNCGDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WLB6nbagsgtKIB0CgGFXSInCO1CJCLid01+hxK+z8/wVIJfiGCBEDxgZjQhL2ml+uQz+J4gDfRC/9mmj87GRvjdt/M4lcfPLeDcajohtSEsrf4IJKc4sS1T5ozphZs1nsDHjfoxhgZ/VAv3waLiDQ2wnl4Zsw3m4v+MUZXjoP/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=cyCMC6uO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="cyCMC6uO" Received: by smtp.kernel.org (Postfix) with ESMTPS id 35B6DC4CEEB; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1740488959; bh=KF5ZO6ejS0ACndO4NFjdXXOOXXaUCY9pfvk3vfNCGDc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cyCMC6uOVL6ENJBMx1lXJrPO0uR1bu1jjC30djlZQ78iRHEqdynObv6jUjVwBrc0N 9evlK/yYrORjOHTwJESmj3GBeHBQiX3HOhUvHFHPbm4VRDr9eS2oNVjZt5zX3gfIz9 O2trTR2gDcjzZTIVRdIohh4aJ4XlWRrAb40HXu6A= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2330FC021BB; Tue, 25 Feb 2025 13:09:19 +0000 (UTC) From: Richard Leitner Date: Tue, 25 Feb 2025 14:08:42 +0100 Subject: [PATCH 3/3] media: i2c: ov9282: fix analogue gain maximum Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250225-b4-ov9282-gain-v1-3-a24af2820dde@linux.dev> References: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> In-Reply-To: <20250225-b4-ov9282-gain-v1-0-a24af2820dde@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Richard Leitner X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1740488957; l=2508; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=KF5ZO6ejS0ACndO4NFjdXXOOXXaUCY9pfvk3vfNCGDc=; b=Wy3qIvcFnUZxA6mDs+WE167dDcqWuS83NVPC7MitfLarLKKapbyUYFnFzapJIgVl6JQsg2/Hf /irWAutIOKQCLac2qmTmi2mz9uo/8jG2Nwvy1oR3Vk8J40E43apvdXe X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 The sensors analogue gain is stored within two "LONG GAIN" registers (0x3508 and 0x3509) where the first one holds the upper 5 bits of the value. The second register (0x3509) holds the lower 4 bits of the gain value in its upper 4 bits. The lower 4 register bits are fraction bits. This patch changes the gain control to adhere to the datasheet and make the "upper gain register" (0x3508) accessible via the gain control, resulting in a new maximum of 0x1fff instead of 0xff. As the "upper gain register" is now written during exposure/gain update remove the hard-coded 0x00 write to it from common_regs. We cover only the "real gain format" use-case. The "sensor gain format" one is ignored as based on the hard-coded "AEC MANUAL" register configuration it is disabled. All values are based on the OV9281 datasheet v1.01 (09.18.2015). Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index c882a021cf18852237bf9b9524d3de0c5b48cbcb..e6effb2b42d4d5d0ca3d924df59c60512f9ce65d 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -54,11 +54,11 @@ #define OV9282_AEC_MANUAL_DEFAULT 0x00 /* Analog gain control */ -#define OV9282_REG_AGAIN 0x3509 -#define OV9282_AGAIN_MIN 0x10 -#define OV9282_AGAIN_MAX 0xff -#define OV9282_AGAIN_STEP 1 -#define OV9282_AGAIN_DEFAULT 0x10 +#define OV9282_REG_AGAIN 0x3508 +#define OV9282_AGAIN_MIN 0x0010 +#define OV9282_AGAIN_MAX 0x1fff +#define OV9282_AGAIN_STEP 0x0001 +#define OV9282_AGAIN_DEFAULT 0x0010 /* Group hold register */ #define OV9282_REG_HOLD 0x3308 @@ -226,7 +226,6 @@ static const struct ov9282_reg common_regs[] = { {OV9282_REG_AEC_MANUAL, OV9282_GAIN_PREC16_EN}, {0x3505, 0x8c}, {0x3507, 0x03}, - {0x3508, 0x00}, {0x3610, 0x80}, {0x3611, 0xa0}, {0x3620, 0x6e}, @@ -605,7 +604,11 @@ static int ov9282_update_exp_gain(struct ov9282 *ov9282, u32 exposure, u32 gain) if (ret) goto error_release_group_hold; - ret = ov9282_write_reg(ov9282, OV9282_REG_AGAIN, 1, gain); + ret = ov9282_write_reg(ov9282, OV9282_REG_AGAIN, 1, (gain >> 8) & 0x1f); + if (ret) + goto error_release_group_hold; + + ret = ov9282_write_reg(ov9282, OV9282_REG_AGAIN + 1, 1, gain & 0xff); error_release_group_hold: ov9282_write_reg(ov9282, OV9282_REG_HOLD, 1, 0);