[v2,094/106] ccs: Add digital gain support

Message ID	20201007084557.25843-85-sakari.ailus@linux.intel.com
State	Superseded
Headers	show Return-Path: <SRS0=q2TO=DO=vger.kernel.org=linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Subject: [PATCH v2 094/106] ccs: Add digital gain support Date: Wed, 7 Oct 2020 11:45:45 +0300 Message-Id: <20201007084557.25843-85-sakari.ailus@linux.intel.com> In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com> References: <20201007084505.25761-1-sakari.ailus@linux.intel.com> <20201007084557.25843-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [v2,002/106] smiapp: Use CCS register flags [v2,004/106] smiapp: Remove macros for defining registers, merge definitions [v2,009/106] smiapp: Obtain frame descriptor from CCS limits [v2,011/106] smiapp: Use CCS limits in reading binning capabilities [v2,013/106] smiapp: Remove quirk function for writing a single 8-bit register [v2,014/106] smiapp: Rename register access functions [v2,015/106] smiapp: Internal rename to CCS [v2,016/106] smiapp: Differentiate CCS sensors from SMIA in subdev naming [v2,019/106] ccs: Give all subdevs a function [v2,027/106] ccs: Request for "reset" GPIO [v2,029/106] ccs: Remove the I²C ID table [v2,032/106] ccs: Fix obtaining bus information from firmware [v2,033/106] ccs: Add CCS static data parser library [v2,034/106] ccs: Combine revision number major and minor into one [v2,036/106] ccs: Stop reading arrays after the first zero [v2,039/106] ccs: Refactor register reading a little [v2,040/106] ccs: Make real to integer number conversion optional [v2,041/106] ccs: Move limit value real to integer conversion from read to access time [v2,043/106] smiapp-pll: Rename as ccs-pll [v2,020/106] dt-bindings: nokia,smia: Fix link-frequencies documentation [v2,044/106] ccs-pll: Fix MODULE_LICENSE [v2,021/106] dt-bindings: nokia,smia: Make vana-supply optional [v2,023/106] dt-bindings: nokia,smia: Convert to YAML [v2,049/106] ccs: Wrap long lines, unwrap short ones [v2,025/106] dt-bindings: nokia,smia: Amend SMIA bindings with MIPI CCS support [v2,050/106] ccs: Add device compatible identifiers for telling SMIA and CCS apart [v2,053/106] dt-bindings: mipi,ccs: Don't mention vana voltage [v2,052/106] ccs: Remove unnecessary delays from power-up sequence [v2,055/106] ccs: Use all regulators [v2,058/106] ccs-pll: Use correct VT divisor for calculating VT SYS divisor [v2,059/106] ccs-pll: End search if there are no better values available [v2,061/106] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [v2,063/106] ccs-pll: Document the structs in the header as well as the function [v2,067/106] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [v2,074/106] ccs-pll: Add support for extended input PLL clock divider [v2,075/106] ccs-pll: Support two cycles per pixel on OP domain [v2,076/106] ccs-pll: Add support flexible OP PLL pixel clock divider [v2,077/106] ccs-pll: Add sanity checks [v2,079/106] ccs-pll: Split off VT subtree calculation [v2,083/106] ccs-pll: Rework bounds checks [v2,085/106] ccs-pll: Fix VT post-PLL divisor calculation [v2,086/106] ccs-pll: Separate VT divisor limit calculation from the rest [v2,087/106] ccs-pll: Add trivial dual PLL support [v2,088/106] ccs: Dual PLL support [v2,091/106] ccs: Print written register values [v2,093/106] ccs: Add support for obtaining C-PHY configuration from firmware [v2,094/106] ccs: Add digital gain support [v2,096/106] ccs: Remove analogue gain field [v2,097/106] ccs: Only add analogue gain control if the device supports it [v2,098/106] v4l: uapi: Add user control base for CCS controls [v2,099/106] v4l: uapi: ccs: Add controls for analogue gain constants [v2,101/106] v4l: uapi: ccs: Add controls for CCS alternative analogue gain [v2,105/106] ccs: Add shading correction and luminance correction level controls

Message ID

20201007084557.25843-85-sakari.ailus@linux.intel.com

State

Superseded

Headers

From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH v2 094/106] ccs: Add digital gain support
Date: Wed,  7 Oct 2020 11:45:45 +0300
Message-Id: <20201007084557.25843-85-sakari.ailus@linux.intel.com>
In-Reply-To: <20201007084557.25843-1-sakari.ailus@linux.intel.com>
References: <20201007084505.25761-1-sakari.ailus@linux.intel.com>
	<20201007084557.25843-1-sakari.ailus@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Sakari Ailus Oct. 7, 2020, 8:45 a.m. UTC

CCS supports global (all-component) digital gain. Add support for it.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/ccs/ccs-core.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index d1a9a28f29ae..7975b3900017 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -671,6 +671,11 @@  static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)
 	case V4L2_CID_ANALOGUE_GAIN:
 		rval = ccs_write(sensor, ANALOG_GAIN_CODE_GLOBAL, ctrl->val);
 
+		break;
+
+	case V4L2_CID_DIGITAL_GAIN:
+		rval = ccs_write(sensor, DIGITAL_GAIN_GLOBAL, ctrl->val);
+
 		break;
 	case V4L2_CID_EXPOSURE:
 		rval = ccs_write(sensor, COARSE_INTEGRATION_TIME, ctrl->val);
@@ -740,7 +745,7 @@  static int ccs_init_controls(struct ccs_sensor *sensor)
 	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
 	int rval;
 
-	rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 12);
+	rval = v4l2_ctrl_handler_init(&sensor->pixel_array->ctrl_handler, 13);
 	if (rval)
 		return rval;
 
@@ -754,6 +759,16 @@  static int ccs_init_controls(struct ccs_sensor *sensor)
 		max(CCS_LIM(sensor, ANALOG_GAIN_CODE_STEP), 1U),
 		CCS_LIM(sensor, ANALOG_GAIN_CODE_MIN));
 
+	if (CCS_LIM(sensor, DIGITAL_GAIN_CAPABILITY) ==
+	    CCS_DIGITAL_GAIN_CAPABILITY_GLOBAL)
+		v4l2_ctrl_new_std(&sensor->pixel_array->ctrl_handler,
+				  &ccs_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
+				  CCS_LIM(sensor, DIGITAL_GAIN_MIN),
+				  CCS_LIM(sensor, DIGITAL_GAIN_MAX),
+				  max(CCS_LIM(sensor, DIGITAL_GAIN_STEP_SIZE),
+				      1U),
+				  0x100);
+
 	/* Exposure limits will be updated soon, use just something here. */
 	sensor->exposure = v4l2_ctrl_new_std(
 		&sensor->pixel_array->ctrl_handler, &ccs_ctrl_ops,

[v2,094/106] ccs: Add digital gain support

Commit Message

Patch