From nobody Tue Nov 26 08:42:12 2024 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 AFA6B1991C6; Sun, 20 Oct 2024 22:14:12 +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=1729462452; cv=none; b=ek+Ef6E8WijmPeHARA+VxjCjJaI+eNkE8h73zfpiM9zQ2roTUfDLckLaVAodyC3sk8LMR3RvqNyrTgGXQciuC7sfN8TamiFzExnvfThobrB3ooOfs7DtPqctBKNKsGll6I4qMKulqMIOFl4OGHF9DhEJD3jThXOZ3I2lsEWMEJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729462452; c=relaxed/simple; bh=71QPmlZCbZanm+0hrX+C+CLoss9GpN+DnnoqT8310lE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HKPPP1ZOZ59Cqb5MI2SVrIoT/5aiRgz8sodegcZb2K08RlXBTh7TA8QEXo3OptE7p9ZFtjBQ9SGmyaF/S1w6TGhzDb84gRMURT6fefHU4YFVrcr3eTzhH6dqNShFV4JOw3EPkFImuUkmfbZu6iPzsKhE2/RX86QqftK+XcMplMc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wl2cqdwK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wl2cqdwK" Received: by smtp.kernel.org (Postfix) with ESMTPS id 43957C4CEFD; Sun, 20 Oct 2024 22:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729462452; bh=71QPmlZCbZanm+0hrX+C+CLoss9GpN+DnnoqT8310lE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Wl2cqdwKJzlDLN5BQciKp9Fk+linQvpY5YloAa0NdkiZYDA/0tA4GS47sOd8GyJ3x wpYhEBFmPRX68Z9v045L+trwyWUjkRabD28OoqdCH/FjDf38aV9Q45kNlI/i5QZ73/ W9T3C1muGRRbAsOvn0WcowO94y4c+8x7V7DAyVOMifbYF3q/vgiTPpCUG/xc5ioQCe 0Yj3b/s28jkMVBgE21x1ucTmUpT60s47njRqgOR27JC0fWXWtSh/2ZxMMzB1ilz627 4po4k+jtrwvYey7thvNPA1wwkGiTexkwVw/1eCHE5X7EfxZEAbQp8MQelpDcH4V4zF UfNVG6boWGwLA== 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 38FE4D3C937; Sun, 20 Oct 2024 22:14:12 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Mon, 21 Oct 2024 00:13:31 +0200 Subject: [PATCH v2 11/13] media: i2c: imx214: Add analogue/digital gain control Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241021-imx214-v2-11-fbd23e99541e@apitzsch.eu> References: <20241021-imx214-v2-0-fbd23e99541e@apitzsch.eu> In-Reply-To: <20241021-imx214-v2-0-fbd23e99541e@apitzsch.eu> To: Ricardo Ribalda , Mauro Carvalho Chehab , Sakari Ailus Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Stevenson , =?utf-8?q?Andr=C3=A9_Apitzsch?= , Ricardo Ribalda X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729462449; l=4360; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=rXL1g7Oe8YzuPPhYACw/Jy36nnaFTf5MQS8SSUXbNRE=; b=WXzI6ca0GpCmGXV5kfd81sVpwBwcxO20nmSYMpCVzCYDlSMqSE99G519iO0kdYJTqvNoBcrlz +3B7Ev4qk4rBGIiATX+S+xa2f/eZgvQvJONCJhC8YpRWxdoSt2aI+Mi X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch The imx214 sensor supports analogue gain up to 8x and digital gain up to 16x. Implement the corresponding controls in the driver. Default gain values are not modified by this patch. Acked-by: Ricardo Ribalda Signed-off-by: Andr=C3=A9 Apitzsch --- drivers/media/i2c/imx214.c | 53 +++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index f2d21c2e8cf84ed25403c98e280073f32e50e758..ad1f88057ac47ae0d494d7a1052= 0fabf969315ed 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -53,12 +53,20 @@ /* Analog gain control */ #define IMX214_REG_ANALOG_GAIN CCI_REG16(0x0204) #define IMX214_REG_SHORT_ANALOG_GAIN CCI_REG16(0x0216) +#define IMX214_ANA_GAIN_MIN 0 +#define IMX214_ANA_GAIN_MAX 448 +#define IMX214_ANA_GAIN_STEP 1 +#define IMX214_ANA_GAIN_DEFAULT 0x0 =20 /* Digital gain control */ #define IMX214_REG_DIG_GAIN_GREENR CCI_REG16(0x020e) #define IMX214_REG_DIG_GAIN_RED CCI_REG16(0x0210) #define IMX214_REG_DIG_GAIN_BLUE CCI_REG16(0x0212) #define IMX214_REG_DIG_GAIN_GREENB CCI_REG16(0x0214) +#define IMX214_DGTL_GAIN_MIN 0x0100 +#define IMX214_DGTL_GAIN_MAX 0x0fff +#define IMX214_DGTL_GAIN_DEFAULT 0x0100 +#define IMX214_DGTL_GAIN_STEP 1 =20 #define IMX214_REG_ORIENTATION CCI_REG8(0x0101) =20 @@ -273,13 +281,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = =3D { =20 { IMX214_REG_SHORT_EXPOSURE, 500 }, =20 - { IMX214_REG_ANALOG_GAIN, 0 }, - { IMX214_REG_DIG_GAIN_GREENR, 256 }, - { IMX214_REG_DIG_GAIN_RED, 256 }, - { IMX214_REG_DIG_GAIN_BLUE, 256 }, - { IMX214_REG_DIG_GAIN_GREENB, 256 }, - { IMX214_REG_SHORT_ANALOG_GAIN, 0 }, - { CCI_REG8(0x4170), 0x00 }, { CCI_REG8(0x4171), 0x10 }, { CCI_REG8(0x4176), 0x00 }, @@ -329,13 +330,6 @@ static const struct cci_reg_sequence mode_1920x1080[] = =3D { =20 { IMX214_REG_SHORT_EXPOSURE, 500 }, =20 - { IMX214_REG_ANALOG_GAIN, 0 }, - { IMX214_REG_DIG_GAIN_GREENR, 256 }, - { IMX214_REG_DIG_GAIN_RED, 256 }, - { IMX214_REG_DIG_GAIN_BLUE, 256 }, - { IMX214_REG_DIG_GAIN_GREENB, 256 }, - { IMX214_REG_SHORT_ANALOG_GAIN, 0 }, - { CCI_REG8(0x4170), 0x00 }, { CCI_REG8(0x4171), 0x10 }, { CCI_REG8(0x4176), 0x00 }, @@ -756,6 +750,18 @@ static int imx214_entity_init_state(struct v4l2_subdev= *subdev, return 0; } =20 +static int imx214_update_digital_gain(struct imx214 *imx214, u32 val) +{ + int ret =3D 0; + + cci_write(imx214->regmap, IMX214_REG_DIG_GAIN_GREENR, val, &ret); + cci_write(imx214->regmap, IMX214_REG_DIG_GAIN_RED, val, &ret); + cci_write(imx214->regmap, IMX214_REG_DIG_GAIN_BLUE, val, &ret); + cci_write(imx214->regmap, IMX214_REG_DIG_GAIN_GREENB, val, &ret); + + return ret; +} + static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) { struct imx214 *imx214 =3D container_of(ctrl->handler, @@ -787,6 +793,15 @@ static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) return 0; =20 switch (ctrl->id) { + case V4L2_CID_ANALOGUE_GAIN: + cci_write(imx214->regmap, IMX214_REG_ANALOG_GAIN, + ctrl->val, &ret); + cci_write(imx214->regmap, IMX214_REG_SHORT_ANALOG_GAIN, + ctrl->val, &ret); + break; + case V4L2_CID_DIGITAL_GAIN: + ret =3D imx214_update_digital_gain(imx214, ctrl->val); + break; case V4L2_CID_EXPOSURE: cci_write(imx214->regmap, IMX214_REG_EXPOSURE, ctrl->val, &ret); break; @@ -833,7 +848,7 @@ static int imx214_ctrls_init(struct imx214 *imx214) return ret; =20 ctrl_hdlr =3D &imx214->ctrls; - ret =3D v4l2_ctrl_handler_init(&imx214->ctrls, 10); + ret =3D v4l2_ctrl_handler_init(&imx214->ctrls, 12); if (ret) return ret; =20 @@ -870,6 +885,14 @@ static int imx214_ctrls_init(struct imx214 *imx214) IMX214_EXPOSURE_STEP, exposure_def); =20 + v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, V4L2_CID_ANALOGUE_GAIN, + IMX214_ANA_GAIN_MIN, IMX214_ANA_GAIN_MAX, + IMX214_ANA_GAIN_STEP, IMX214_ANA_GAIN_DEFAULT); + + v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, V4L2_CID_DIGITAL_GAIN, + IMX214_DGTL_GAIN_MIN, IMX214_DGTL_GAIN_MAX, + IMX214_DGTL_GAIN_STEP, IMX214_DGTL_GAIN_DEFAULT); + imx214->hflip =3D v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0); if (imx214->hflip) --=20 2.47.0