[088/100] ccs: Add digital gain support

Message ID	20200930152858.8471-89-sakari.ailus@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=fdi2=DH=vger.kernel.org=linux-media-owner@kernel.org> From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Subject: [PATCH 088/100] ccs: Add digital gain support Date: Wed, 30 Sep 2020 18:28:46 +0300 Message-Id: <20200930152858.8471-89-sakari.ailus@linux.intel.com> In-Reply-To: <20200930152858.8471-1-sakari.ailus@linux.intel.com> References: <20200930152858.8471-1-sakari.ailus@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	CCS driver \| expand [000/100] CCS driver [001/100] smiapp: Add CCS register definitions and limits [002/100] smiapp: Use CCS register flags [003/100] smiapp: Calculate CCS limit offsets and limit buffer size [004/100] smiapp: Remove macros for defining registers, merge definitions [005/100] smiapp: Add macros for accessing CCS registers [006/100] smiapp: Use MIPI CCS version and manufacturer ID information [007/100] smiapp: Read CCS limit values [008/100] smiapp: Switch to CCS limits [009/100] smiapp: Obtain frame descriptor from CCS limits [010/100] smiapp: Use CCS limits in reading data format descriptors [011/100] smiapp: Use CCS limits in reading binning capabilities [012/100] smiapp: Use CCS registers [013/100] smiapp: Remove quirk function for writing a single 8-bit register [014/100] smiapp: Rename register access functions [015/100] smiapp: Internal rename to CCS [016/100] smiapp: Differentiate CCS sensors from SMIA in subdev naming [017/100] smiapp: Rename as "ccs" [018/100] ccs: Remove profile concept [019/100] ccs: Give all subdevs a function [020/100] dt-bindings: Add vendor prefix for MIPI Alliance [021/100] dt-bindings: nokia,smia: Fix link-frequencies documentation [022/100] dt-bindings: nokia,smia: Make vana-supply optional [023/100] dt-bindings: nokia,smia: Convert to YAML [024/100] dt-bindings: nokia,smia: Use better active polarity for reset [025/100] dt-bindings: Amend SMIA bindings with MIPI CCS support [026/100] dt-bindings: Add bus-type for C-PHY support [027/100] ccs: Request for "reset" GPIO [028/100] ccs: Add "mipi,ccs" compatible string [029/100] ccs: Remove the I²C ID table [030/100] ccs: Remove remaining support for platform data [031/100] ccs: Make hwcfg part of the device specific struct [032/100] ccs: Add CCS static data parser library [033/100] ccs: Combine revision number major and minor into one [034/100] ccs: Read CCS static data from firmware binaries [035/100] ccs: Stop reading arrays after the first zero [036/100] ccs: The functions to get compose or crop rectangle never return NULL [037/100] ccs: Replace somewhat harsh internal checks based on BUG with WARN_ON [038/100] ccs: Refactor register reading a little [039/100] ccs: Make real to integer number conversion optional [040/100] ccs: Move limit value real to integer conversion from read to access time [041/100] ccs: Read ireal numbers correctly [042/100] smiapp-pll: Rename as ccs-pll [043/100] ccs: Change my e-mail address [044/100] ccs: Add support for manufacturer regs from sensor and module files [045/100] ccs: Use static data read-only registers [046/100] ccs: Clean up runtime PM usage [047/100] ccs: Wrap long lines, unwrap short ones [048/100] ccs: Add device compatible identifiers for telling SMIA and CCS apart [049/100] ccs: Use longer pre-I²C sleep for CCS compliant devices [050/100] ccs-pll: Don't use div_u64 to divide a 32-bit number [051/100] ccs-pll: Split limits and PLL configuration into front and back parts [052/100] ccs-pll: Use correct VT divisor for calculating VT SYS divisor [053/100] ccs-pll: End search if there are no better values available [054/100] ccs-pll: Remove parallel bus support [055/100] ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY [056/100] ccs-pll: Move the flags field down, away from 8-bit fields [057/100] ccs-pll: Document the structs in the header as well as the function [058/100] ccs-pll: Use the BIT macro [059/100] ccs-pll: Begin calculation from OP system clock frequency [060/100] ccs-pll: Fix condition for pre-PLL divider lower bound [061/100] ccs-pll: Avoid overflow in pre-PLL divisor lower bound search [062/100] ccs-pll: Fix comment on check against maximum PLL multiplier [063/100] ccs-pll: Fix check for PLL multiplier upper bound [064/100] ccs-pll: Use explicit 32-bit unsigned type [065/100] ccs-pll: Add support for lane speed model [066/100] ccs: Add support for lane speed model [067/100] ccs-pll: Add support for decoupled OP domain calculation [068/100] ccs-pll: Add support for extended input PLL clock divider [069/100] ccs-pll: Support two cycles per pixel on OP domain [070/100] ccs-pll: Add support flexible OP PLL pixel clock divider [071/100] ccs-pll: Add sanity checks [072/100] ccs-pll: Add C-PHY support [073/100] ccs-pll: Split off VT subtree calculation [074/100] ccs-pll: Check for derating and overrating, support non-derating sensors [075/100] ccs-pll: Better separate OP and VT sub-tree calculation [076/100] ccs-pll: Print relevant information on PLL tree [077/100] ccs-pll: Rework bounds checks [078/100] ccs-pll: Make VT divisors 16-bit [079/100] ccs-pll: Fix VT post-PLL divisor calculation [080/100] ccs-pll: Separate VT divisor limit calculation from the rest [081/100] ccs-pll: Add trivial dual PLL support [082/100] ccs: Dual PLL support [083/100] ccs-pll: Add support for DDR OP system and pixel clocks [084/100] ccs: Add support for DDR OP SYS and OP PIX clocks [085/100] ccs: Print written register values [086/100] ccs-pll: Print pixel rates [087/100] ccs: Add support for obtaining C-PHY configuration from firmware [088/100] ccs: Add digital gain support [089/100] ccs: Add support for old-style SMIA digital gain [090/100] ccs: Remove analogue gain field [091/100] ccs: Only add analogue gain control if the device supports it [092/100] v4l: Add user control base for CCS controls [093/100] v4l: uapi: Add controls for analogue gain constants [094/100] ccs: Add support for analogue gain coefficient controls [095/100] v4l: uapi: Add controls for CCS alternative analogue gain [096/100] ccs: Add support for alternate analogue global gain [097/100] ccs: Add debug prints for MSR registers [098/100] v4l: uapi: Add CCS controls for correction configuration and capabilities [099/100] ccs: Add shading correction and luminance correction level controls [100/100] smiapp: Add CCS ACPI device ID

Message ID

20200930152858.8471-89-sakari.ailus@linux.intel.com (mailing list archive)

State

New, archived

Headers

From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 088/100] ccs: Add digital gain support
Date: Wed, 30 Sep 2020 18:28:46 +0300
Message-Id: <20200930152858.8471-89-sakari.ailus@linux.intel.com>
In-Reply-To: <20200930152858.8471-1-sakari.ailus@linux.intel.com>
References: <20200930152858.8471-1-sakari.ailus@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

CCS driver | expand

Commit Message

Sakari Ailus Sept. 30, 2020, 3:28 p.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 00a1ea46f25a..1cb46de003e5 100644
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -669,6 +669,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);
@@ -738,7 +743,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;
 
@@ -752,6 +757,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,

[088/100] ccs: Add digital gain support

Commit Message

Patch