[002/100] smiapp: Use CCS register flags

Message ID	20200930152858.8471-3-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 002/100] smiapp: Use CCS register flags Date: Wed, 30 Sep 2020 18:27:20 +0300 Message-Id: <20200930152858.8471-3-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-3-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 002/100] smiapp: Use CCS register flags
Date: Wed, 30 Sep 2020 18:27:20 +0300
Message-Id: <20200930152858.8471-3-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:27 p.m. UTC

Use the CCS register flags instead of the old smia flags. The
new flags include the register width information that was separate from
the register flags previously.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/smiapp/smiapp-reg-defs.h |  8 ++++----
 drivers/media/i2c/smiapp/smiapp-regs.c     | 20 +++++++++++++-------
 drivers/media/i2c/smiapp/smiapp-regs.h     | 13 ++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/drivers/media/i2c/smiapp/smiapp-reg-defs.h b/drivers/media/i2c/smiapp/smiapp-reg-defs.h
index 865488befc09..ec574007908b 100644
--- a/drivers/media/i2c/smiapp/smiapp-reg-defs.h
+++ b/drivers/media/i2c/smiapp/smiapp-reg-defs.h
@@ -7,11 +7,11 @@ 
  * Copyright (C) 2011--2012 Nokia Corporation
  * Contact: Sakari Ailus <sakari.ailus@iki.fi>
  */
-#define SMIAPP_REG_MK_U8(r) ((SMIAPP_REG_8BIT << 16) | (r))
-#define SMIAPP_REG_MK_U16(r) ((SMIAPP_REG_16BIT << 16) | (r))
-#define SMIAPP_REG_MK_U32(r) ((SMIAPP_REG_32BIT << 16) | (r))
+#define SMIAPP_REG_MK_U8(r)	(r)
+#define SMIAPP_REG_MK_U16(r)	(CCS_FL_16BIT | (r))
+#define SMIAPP_REG_MK_U32(r)	(CCS_FL_32BIT | (r))
 
-#define SMIAPP_REG_MK_F32(r) (SMIAPP_REG_FLAG_FLOAT | (SMIAPP_REG_32BIT << 16) | (r))
+#define SMIAPP_REG_MK_F32(r)	(CCS_FL_FLOAT_IREAL | CCS_FL_32BIT | (r))
 
 #define SMIAPP_REG_U16_MODEL_ID					SMIAPP_REG_MK_U16(0x0000)
 #define SMIAPP_REG_U8_REVISION_NUMBER_MAJOR			SMIAPP_REG_MK_U8(0x0002)
diff --git a/drivers/media/i2c/smiapp/smiapp-regs.c b/drivers/media/i2c/smiapp/smiapp-regs.c
index 1b58b7c6c839..904054d303ba 100644
--- a/drivers/media/i2c/smiapp/smiapp-regs.c
+++ b/drivers/media/i2c/smiapp/smiapp-regs.c
@@ -133,6 +133,16 @@  static int ____smiapp_read_8only(struct smiapp_sensor *sensor, u16 reg,
 	return 0;
 }
 
+unsigned int ccs_reg_width(u32 reg)
+{
+	if (reg & CCS_FL_16BIT)
+		return sizeof(uint16_t);
+	if (reg & CCS_FL_32BIT)
+		return sizeof(uint32_t);
+
+	return sizeof(uint8_t);
+}
+
 /*
  * Read a 8/16/32-bit i2c register.  The value is returned in 'val'.
  * Returns zero if successful, or non-zero otherwise.
@@ -141,13 +151,9 @@  static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val,
 			 bool only8)
 {
 	struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
-	u8 len = SMIAPP_REG_WIDTH(reg);
+	unsigned int len = ccs_reg_width(reg);
 	int rval;
 
-	if (len != SMIAPP_REG_8BIT && len != SMIAPP_REG_16BIT
-	    && len != SMIAPP_REG_32BIT)
-		return -EINVAL;
-
 	if (!only8)
 		rval = ____smiapp_read(sensor, SMIAPP_REG_ADDR(reg), len, val);
 	else
@@ -156,7 +162,7 @@  static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val,
 	if (rval < 0)
 		return rval;
 
-	if (reg & SMIAPP_REG_FLAG_FLOAT)
+	if (reg & CCS_FL_FLOAT_IREAL)
 		*val = float_to_u32_mul_1000000(client, *val);
 
 	return 0;
@@ -204,7 +210,7 @@  int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val)
 	struct i2c_msg msg;
 	unsigned char data[6];
 	unsigned int retries;
-	u8 len = SMIAPP_REG_WIDTH(reg);
+	unsigned int len = ccs_reg_width(reg);
 	int r;
 
 	if (len > sizeof(data) - 2)
diff --git a/drivers/media/i2c/smiapp/smiapp-regs.h b/drivers/media/i2c/smiapp/smiapp-regs.h
index 8fda6ed5668c..7223f5f89109 100644
--- a/drivers/media/i2c/smiapp/smiapp-regs.h
+++ b/drivers/media/i2c/smiapp/smiapp-regs.h
@@ -14,16 +14,9 @@ 
 #include <linux/i2c.h>
 #include <linux/types.h>
 
-#define SMIAPP_REG_ADDR(reg)		((u16)reg)
-#define SMIAPP_REG_WIDTH(reg)		((u8)(reg >> 16))
-#define SMIAPP_REG_FLAGS(reg)		((u8)(reg >> 24))
-
-/* Use upper 8 bits of the type field for flags */
-#define SMIAPP_REG_FLAG_FLOAT		(1 << 24)
+#include "ccs-regs.h"
 
-#define SMIAPP_REG_8BIT			1
-#define SMIAPP_REG_16BIT		2
-#define SMIAPP_REG_32BIT		4
+#define SMIAPP_REG_ADDR(reg)		((u16)reg)
 
 struct smiapp_sensor;
 
@@ -33,4 +26,6 @@  int smiapp_read_8only(struct smiapp_sensor *sensor, u32 reg, u32 *val);
 int smiapp_write_no_quirk(struct smiapp_sensor *sensor, u32 reg, u32 val);
 int smiapp_write(struct smiapp_sensor *sensor, u32 reg, u32 val);
 
+unsigned int ccs_reg_width(u32 reg);
+
 #endif

[002/100] smiapp: Use CCS register flags

Commit Message

Patch