From: Mikhail Rudenko <mike.rudenko@gmail.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Jacopo Mondi <jacopo@jmondi.org>,
Tommaso Merciai <tommaso.merciai@amarulasolutions.com>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Mikhail Rudenko <mike.rudenko@gmail.com>
Subject: [PATCH 13/19] media: i2c: ov4689: Implement manual color balance controls
Date: Mon, 11 Dec 2023 20:50:16 +0300 [thread overview]
Message-ID: <20231211175023.1680247-14-mike.rudenko@gmail.com> (raw)
In-Reply-To: <20231211175023.1680247-1-mike.rudenko@gmail.com>
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 <mike.rudenko@gmail.com>
---
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 ed0ce1b9e55b..18e1fd564ec0 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_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
@@ -630,6 +637,12 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_DIGITAL_GAIN:
cci_write(regmap, OV4689_REG_DIG_GAIN, val, &ret);
break;
+ case V4L2_CID_RED_BALANCE:
+ cci_write(regmap, OV4689_REG_WB_GAIN_RED, val, &ret);
+ break;
+ case V4L2_CID_BLUE_BALANCE:
+ cci_write(regmap, OV4689_REG_WB_GAIN_BLUE, val, &ret);
+ break;
default:
dev_warn(dev, "%s Unhandled id:0x%x, val:0x%x\n",
__func__, ctrl->id, val);
@@ -658,7 +671,7 @@ static int ov4689_initialize_controls(struct ov4689 *ov4689)
handler = &ov4689->ctrl_handler;
mode = ov4689->cur_mode;
- ret = v4l2_ctrl_handler_init(handler, 14);
+ ret = v4l2_ctrl_handler_init(handler, 16);
if (ret)
return ret;
@@ -705,6 +718,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);
--
2.43.0
next prev parent reply other threads:[~2023-12-11 17:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 17:50 [PATCH 00/19] Omnivision OV4689 refactoring and improvements Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 01/19] media: i2c: ov4689: Clean up and annotate the register table Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 02/19] media: i2c: ov4689: Fix typo in a comment Mikhail Rudenko
2023-12-11 18:01 ` Laurent Pinchart
2023-12-12 12:22 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 03/19] media: i2c: ov4689: CCI conversion Mikhail Rudenko
2023-12-11 18:08 ` Laurent Pinchart
2023-12-11 17:50 ` [PATCH 04/19] media: i2c: ov4689: Remove i2c_client from ov4689 struct Mikhail Rudenko
2023-12-11 18:09 ` Laurent Pinchart
2023-12-11 17:50 ` [PATCH 05/19] media: i2c: ov4689: Refactor ov4689_set_ctrl Mikhail Rudenko
2023-12-11 18:11 ` Laurent Pinchart
2023-12-12 12:25 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 06/19] media: i2c: ov4689: Set gain in one 16 bit write Mikhail Rudenko
2023-12-11 18:11 ` Laurent Pinchart
2023-12-11 17:50 ` [PATCH 07/19] media: i2c: ov4689: Use sub-device active state Mikhail Rudenko
2023-12-11 18:15 ` Laurent Pinchart
2023-12-12 12:27 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 08/19] media: i2c: ov4689: Enable runtime PM before registering sub-device Mikhail Rudenko
2023-12-11 18:19 ` Laurent Pinchart
2023-12-12 12:32 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 09/19] media: i2c: ov4689: Remove max_fps field from struct ov4689_mode Mikhail Rudenko
2023-12-11 18:19 ` Laurent Pinchart
2023-12-11 17:50 ` [PATCH 10/19] media: i2c: ov4689: Make horizontal blanking configurable Mikhail Rudenko
2023-12-11 22:08 ` Laurent Pinchart
2023-12-12 12:37 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 11/19] media: i2c: ov4689: Implement vflip/hflip controls Mikhail Rudenko
2023-12-11 22:10 ` Laurent Pinchart
2023-12-12 12:42 ` Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 12/19] media: i2c: ov4689: Implement digital gain control Mikhail Rudenko
2023-12-11 22:15 ` Laurent Pinchart
2023-12-12 12:52 ` Mikhail Rudenko
2023-12-12 12:52 ` Mikhail Rudenko
2023-12-18 18:04 ` Laurent Pinchart
2023-12-18 20:10 ` Mikhail Rudenko
2023-12-11 17:50 ` Mikhail Rudenko [this message]
2023-12-11 17:50 ` [PATCH 14/19] media: i2c: ov4689: Move pixel array size out of struct ov4689_mode Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 15/19] media: i2c: ov4689: Set timing registers programmatically Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 16/19] media: i2c: ov4689: Configurable analogue crop Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 17/19] media: i2c: ov4689: Eliminate struct ov4689_mode Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 18/19] media: i2c: ov4689: Refactor ov4689_s_stream Mikhail Rudenko
2023-12-11 17:50 ` [PATCH 19/19] media: i2c: ov4689: Implement 2x2 binning Mikhail Rudenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231211175023.1680247-14-mike.rudenko@gmail.com \
--to=mike.rudenko@gmail.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=dave.stevenson@raspberrypi.com \
--cc=jacopo@jmondi.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tommaso.merciai@amarulasolutions.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox