From nobody Tue Apr 7 08:11:14 2026 Received: from PNYPR01CU001.outbound.protection.outlook.com (mail-centralindiaazon11020143.outbound.protection.outlook.com [52.101.225.143]) (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 096542C181; Sat, 14 Mar 2026 12:25:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.225.143 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491125; cv=fail; b=AvFs1f17Ol4O4qyhiDNFZ27HRQaiVUJezQ+LsVvxJ8BzGavxbF2/RV55yYypkOw/MCebxRC7TL+Bf0QtOoG0fVkqo8EM4fUnmhIsBmXsVVUk02jHZuGbNKNjEINeZCVEgX/IKJxkWGlh7dausjpm8raNDuEMqtJPjKaaEBCx1DU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491125; c=relaxed/simple; bh=uNj0q274vTWI/t2p4n6H4L0Xtpt6rc6U3c9rOhOJSyE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=r+YOP5EEex8hKSZWLhMQmL/lXLttdL3TnVIIClq7ji8CbeXhoHxibBNTkH1i1gM681PW1GmGD7vvZKqg4FK3DzlWUz8JCfta8SaiHzfLozqlieAdzQohVrdgwD0uT51/R+y+uV22yzotux5kMWQ3Ytio3NY1ogRJmHPd5VaIYR0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io; spf=pass smtp.mailfrom=siliconsignals.io; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b=Pwpa9oEH; arc=fail smtp.client-ip=52.101.225.143 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b="Pwpa9oEH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QcYzm8L9C2hP8Ci/bEpZ8J8o5XY1GJJxjIDRlcmeZ+rt1XgVAJJralKzguIVYXDZRuxgN0IjShhhlYuZ0YtsAZde+ArdXP7vtu7PLbC0qUfS9bM3T7wl73nN542bK25OriJ1FI5z28Ox8qVHWaP97dB+P+rVmerdk5cTC2P++a7AcWdRQu0A/iGPDtXP0ux/3JGqIhAinQ5F07ICYYe5Qi6RHPk894EmUWpV9GXWHQToEu+wApJt1UWpFtCZh1HCkFQUwipk2d0kQInj2ultaRqIP9lHZU5kblLBu9lpB5GsGy5FmVHWI0CyY9rbypi3HKAb0zQS8cFZicJ7YWHxug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZwDG6aOvHaB+SyNb4+MQTf1b8dAr/iBanyTzICdaKNs=; b=dU5a8H2SUAC8oDHFrGZbKVaF+OpVyjaNKjMCWF5cWRW4D/VDtC8h/SLkgDImGs5JqJJSC9gFsudDtQlRGYWdmnv8pQnBFfcrIHLoMvGSy5xosiDyz/UrbwXx87VZboJ+f5fuJPz+sHTNTrBC4msZ7CN9yVpboXp3KiOtQNy8ij15mcaS56gZaPNRKzMgySKH/un+7eavNiCdx/nO0sALgEwKPKoFddYZu0biftqMried8zdJwb1XfRDUHMAUDFF4LqzrDlzRr8wB1K/cavXhWMOILpzQ9Q7UOwY4V3I1/QCkzb1OprDtLl/b9ooY+pLgyQJz6R5Uo2Dib/CbzHBRmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siliconsignals.io; dmarc=pass action=none header.from=siliconsignals.io; dkim=pass header.d=siliconsignals.io; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siliconsignals.io; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZwDG6aOvHaB+SyNb4+MQTf1b8dAr/iBanyTzICdaKNs=; b=Pwpa9oEHpKJZErPwuef9tcRt3oJv/FWNzg3IE+KXn1uPsAGoxqHiV2b71hLjDFYwxddNu57+31nw9t33pR9ti83cE9s5bRadQbA9lf9XCQmt9bAxsDjI0tw+C0PbGsHDWWepeHdh592rh5xhZqPIoGELojTH1RHEGplCFPGnxizroIDWVNdkm3AXyO2VVb/1fAeNu+PjYoo9w0r+2oRVoJPZRgJUZTg9pqR2sFKfP9iyFB2FD4czBfE0XUve0KsM3ZrRlYKcxTfkEot5ZJqkZaVrIyG++iBd6xkBzWAhVsmm6RYcb4TWkPHgD73/Nk2ZNli6TU1+EY0EKXF8capKzw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siliconsignals.io; Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) by MA0P287MB0466.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:bf::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.19; Sat, 14 Mar 2026 12:25:19 +0000 Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7]) by PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7%5]) with mapi id 15.20.9700.018; Sat, 14 Mar 2026 12:25:19 +0000 From: Elgin Perumbilly To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: tarang.raval@siliconsignals.io, Elgin Perumbilly , Mauro Carvalho Chehab , Hans Verkuil , Hans de Goede , Vladimir Zapolskiy , Mehdi Djait , Xiaolei Wang , Laurent Pinchart , Sylvain Petinot , Benjamin Mugnier , Heimir Thor Sverrisson , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] media: i2c: imx412: Convert to CCI register access helpers Date: Sat, 14 Mar 2026 17:54:37 +0530 Message-Id: <20260314122442.109356-2-elgin.perumbilly@siliconsignals.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> References: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1P287CA0013.INDP287.PROD.OUTLOOK.COM (2603:1096:b00:40::32) To PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PN3P287MB2188:EE_|MA0P287MB0466:EE_ X-MS-Office365-Filtering-Correlation-Id: 8372aee2-aea2-44aa-1347-08de81c4c19e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: i0Ynho4e15+Hnw1m4vW4KzjFqYwC7a0aty25s60nCNRpjCxmqON7jnwJFiTF7b1cbwIpLvia4vTbBSucjy3jlOFiv56hNjgjbDeIC54U5Osq3kE3dbHi7X0gIM30rIAX7XIVPSSie6XC72Ec7/eRo7Sc6wDgJqNgbIroATI560HHFM8F70PZtT6dmJOWav5peK1KJLWLH3OZhjud52bgSicdtbkgC5CaTEBb9LIWKL08dYRx19/0rxzFndr+ygRD3IUdhI26Uu+sZlf6YYh2IdfmcfEcXPiqRaj/KVPzO7BgWMRgp5sCGm0ge+sLscArzsSXifBGrh/iwOkNY9IOACwqBwUnME9les6fP7tA1Kz30lJUVVp9/9br6CFETTFbWbw/QXEJ0CNx6eG1S+f+kFzrlJA4xbkVpMkBzhX2RRDQqtSFkPtnO+mF5ybXavpWNTuK4AR5Ce1Q1Y1+pTQbd3hVQGdsG7MBWUvXnv5mjcx45LXIvpnSvFp7EQk3u0nTZWIvrBVZ+pX/oHkvoAwSE3KNDdeDrHP9G6N/AqT6V7/9f4qkS94dIKnNE+WpBqJQM7WBi6UK7VZ5SFLdddaEQN1dwsMkjmknpVCFeLSK6qZORodV1MMxW03FDKFFwTutUvHZDG6U4lh5JXTDIFwJlK9pRmcfJ4+f7KrgYNRak2xKMPcaCm2VFfNvc2dzlgzju3ms7ZnM1Zk7qiXhzh3WOBeFOdm7IyhSG/gNs0xZ6r7qv7ZE8Y8hqQXAKU8g8i/ndo6LlXZuWWgT0B1+KmCd6jhzMJ+Q1/Gy0+bZjB+9xeQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3P287MB2188.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CgF/ieI+z7v5LtUNRNUHkSNJ56HJDNeVVZybFsJjbMeNkEY00rBMdK7fw1Rg?= =?us-ascii?Q?1fveHkP5Yo2RyBsTf8TP0y8n+V+WEDQ1Zrqxr4nrEfgrfLULbEpZOukeFqQL?= =?us-ascii?Q?CUpp7aE//UfVPLFgCqKimZugLwYTFfnsZFt9ZST1OzAo4KP31ouodXMXILhM?= =?us-ascii?Q?QEXvZlv7l97KfeuzJ9apuk+PUcgxKY1kxRlsiGtuoY8igxhqhicaJpEWTwFf?= =?us-ascii?Q?NCe7fZv3TPCXYokxXcDEMKcgNlGZYYNL5dqyr3JRwoRq+8qJ3hsQQgYO3j0n?= =?us-ascii?Q?XWkz57wgOHWYlw9OJ4JLWUrp/izwAfueAqX58eebWWABsrpipQYB51MwElyS?= =?us-ascii?Q?Mvo+F10vRMl4O2fpOrsFAV9ibWzDHanbA4nwmb6ClhRvTfowXGR3egBp40XT?= =?us-ascii?Q?AVkfEbVArZHvDGysyv8wNv9FGF6qSeVj5kbgyxVJnYLQTFdOTJGKMqcVmyrp?= =?us-ascii?Q?7tQ89izfmMKxJFYlJX3oWopyaMoEwJ5PWfrpHA8ewz1Yl0VCPRaYJG5DiZvc?= =?us-ascii?Q?QIqs2jC9KUpnpd6YmzXe1Pxu5jKNTlYcL0n383xdywQ5biVq2/ICMhNqhFP1?= =?us-ascii?Q?fWyE+9jc5xVvlLj8xWbVELgtDR2xk99zNt5jgd68+yBw5Nui7tLQ/SViwhBw?= =?us-ascii?Q?A1wyaRqRO2GgPcqdTFgA4T5HTBtHGm0sIk4IkuoHhlId336r/ZNVU/ts76lx?= =?us-ascii?Q?it/ddClFn+o9W448jo7AgCd0Szb66qKuIGQh+TmcjVvlgRP0krT8innmLuvz?= =?us-ascii?Q?8dDEBZhJT4s+n/yZb0z2ZhUHjql8XtIt7WZPuwVFnP55usLA4UOEbPrMJo/t?= =?us-ascii?Q?6oF0j8A0XtGe6fKQxCqBUq9ICqw26XRceEMslhaI88+obErbdYuNECjwcdb+?= =?us-ascii?Q?It7c2+uc+hIkH4jbXbd/WDBHgdl/a4OKhzqDaR+QiNSHuPU3BPu8RKsBG77H?= =?us-ascii?Q?NjEn2LKfnuHqIa50LA1xrJsxT9f4StYBero6wE0luz/ZWJy8jjfTuFYikZhS?= =?us-ascii?Q?2b1QTs/rzI0RQQd9Tp6K2rJQZsSqvfU+wIqP5FStrBDus5Zwn4BMns9xI2aQ?= =?us-ascii?Q?KvERjI36qo1bkbWl/4EG2g4kMpt97xvlIAlENQHOoKihrMJmfPjTd/Pgdshn?= =?us-ascii?Q?FbAKFt1+ZgEkGm0mBr9d5/zoocnqgAncXYwCQsz4WzFTeIGNsz3t7x8SG/FN?= =?us-ascii?Q?imXaM/CxRbQVAwidcroGNQ173W7vlGaI0Z890Gbv24by74l16Mad6Cl/l7zU?= =?us-ascii?Q?GLx1kuHBxW7qGDn413lFRZs7TvQQyFY+BWtrv1o+lWpaKZsVwb0Z+3192ifB?= =?us-ascii?Q?24hnt3Q4F7i1v5kut9yyr7vrAorfskOEJ8qQEM4GYNM2tthQFKk/yswmFT3F?= =?us-ascii?Q?1llUT0a67WxoHRAvVtSsrcuU1ByKYd+BCcGgrrTNod5bkvZdRbXsGr2eSR3j?= =?us-ascii?Q?ft4VOwtGS03XGksdliwgG27R5+gHixcjA0h3TV4bS+7Y3DrZKPh703bm/t2S?= =?us-ascii?Q?k/HW/CyqQeioAOoYbNC2qgCF+PYljvWuibTKsGd9XQeL46qx3TDPbhUsix6Z?= =?us-ascii?Q?1Z7NlPfyWFGJj5ykH0YiI+L6EpwETdv7c4qjhFDlA9YFqCkLorCoi1JglNhR?= =?us-ascii?Q?c9ve2xOaR3mQuXrXTzsL4Cn5j0rFpsAXpaeU5D+tQLhSp0RKVhN1zL4Tx1Ek?= =?us-ascii?Q?urulq0K+BfXShd5ePbwylT37f0JvvPMzESwtwfKILDeiyfebcS/wRlPbMGWj?= =?us-ascii?Q?KgKltVOnpBrYTOSuY9yxbYNaN1E4Cps=3D?= X-OriginatorOrg: siliconsignals.io X-MS-Exchange-CrossTenant-Network-Message-Id: 8372aee2-aea2-44aa-1347-08de81c4c19e X-MS-Exchange-CrossTenant-AuthSource: PN3P287MB2188.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2026 12:25:19.6597 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 7ec5089e-a433-4bd1-a638-82ee62e21d37 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sc763wdIICRKQsnnxKU0OWg3bXlVgvPHc74hPo+MGQl4lcEJbqtEVDVtgfBuUucNVPNnVVUe5cgjSVWbRvGUI1kjM/zju76+LnA5FRPiCJ8Hr+jnaAyn64H3LB51xylx X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB0466 Content-Type: text/plain; charset="utf-8" Use the new common CCI register access helpers to replace the private register access helpers in the imx412 driver. This simplifies the driver by reducing the amount of code. Signed-off-by: Elgin Perumbilly --- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx412.c | 635 ++++++++++++++++--------------------- 2 files changed, 271 insertions(+), 365 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 20482be35f26..1881da7a3967 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -269,6 +269,7 @@ config VIDEO_IMX355 config VIDEO_IMX412 tristate "Sony IMX412 sensor support" depends on OF_GPIO + select V4L2_CCI_I2C help This is a Video4Linux2 sensor driver for the Sony IMX412 camera. diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index e25e0a9ff65c..13d6fe79dcf7 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -13,38 +13,39 @@ #include #include +#include #include #include #include /* Streaming Mode */ -#define IMX412_REG_MODE_SELECT 0x0100 +#define IMX412_REG_MODE_SELECT CCI_REG8(0x0100) #define IMX412_MODE_STANDBY 0x00 #define IMX412_MODE_STREAMING 0x01 /* Lines per frame */ -#define IMX412_REG_LPFR 0x0340 +#define IMX412_REG_LPFR CCI_REG16(0x0340) /* Chip ID */ -#define IMX412_REG_ID 0x0016 +#define IMX412_REG_ID CCI_REG16(0x0016) #define IMX412_ID 0x577 /* Exposure control */ -#define IMX412_REG_EXPOSURE_CIT 0x0202 +#define IMX412_REG_EXPOSURE_CIT CCI_REG16(0x0202) #define IMX412_EXPOSURE_MIN 8 #define IMX412_EXPOSURE_OFFSET 22 #define IMX412_EXPOSURE_STEP 1 #define IMX412_EXPOSURE_DEFAULT 0x0648 /* Analog gain control */ -#define IMX412_REG_AGAIN 0x0204 +#define IMX412_REG_AGAIN CCI_REG16(0x0204) #define IMX412_AGAIN_MIN 0 #define IMX412_AGAIN_MAX 978 #define IMX412_AGAIN_STEP 1 #define IMX412_AGAIN_DEFAULT 0 /* Group hold register */ -#define IMX412_REG_HOLD 0x0104 +#define IMX412_REG_HOLD CCI_REG8(0x0104) /* Input clock rate */ #define IMX412_INCLK_RATE 24000000 @@ -56,16 +57,6 @@ #define IMX412_REG_MIN 0x00 #define IMX412_REG_MAX 0xffff -/** - * struct imx412_reg - imx412 sensor register - * @address: Register address - * @val: Register value - */ -struct imx412_reg { - u16 address; - u8 val; -}; - /** * struct imx412_reg_list - imx412 sensor register list * @num_of_regs: Number of registers in the list @@ -73,7 +64,7 @@ struct imx412_reg { */ struct imx412_reg_list { u32 num_of_regs; - const struct imx412_reg *regs; + const struct cci_reg_sequence *regs; }; /** @@ -111,6 +102,7 @@ static const char * const imx412_supply_names[] =3D { /** * struct imx412 - imx412 sensor device structure * @dev: Pointer to generic device + * @cci: CCI register map * @client: Pointer to i2c client * @sd: V4L2 sub-device * @pad: Media pad. Only one pad supported @@ -130,6 +122,7 @@ static const char * const imx412_supply_names[] =3D { */ struct imx412 { struct device *dev; + struct regmap *cci; struct i2c_client *client; struct v4l2_subdev sd; struct media_pad pad; @@ -155,238 +148,238 @@ static const s64 link_freq[] =3D { }; /* Sensor mode registers */ -static const struct imx412_reg mode_4056x3040_regs[] =3D { - {0x0136, 0x18}, - {0x0137, 0x00}, - {0x3c7e, 0x08}, - {0x3c7f, 0x02}, - {0x38a8, 0x1f}, - {0x38a9, 0xff}, - {0x38aa, 0x1f}, - {0x38ab, 0xff}, - {0x55d4, 0x00}, - {0x55d5, 0x00}, - {0x55d6, 0x07}, - {0x55d7, 0xff}, - {0x55e8, 0x07}, - {0x55e9, 0xff}, - {0x55ea, 0x00}, - {0x55eb, 0x00}, - {0x575c, 0x07}, - {0x575d, 0xff}, - {0x575e, 0x00}, - {0x575f, 0x00}, - {0x5764, 0x00}, - {0x5765, 0x00}, - {0x5766, 0x07}, - {0x5767, 0xff}, - {0x5974, 0x04}, - {0x5975, 0x01}, - {0x5f10, 0x09}, - {0x5f11, 0x92}, - {0x5f12, 0x32}, - {0x5f13, 0x72}, - {0x5f14, 0x16}, - {0x5f15, 0xba}, - {0x5f17, 0x13}, - {0x5f18, 0x24}, - {0x5f19, 0x60}, - {0x5f1a, 0xe3}, - {0x5f1b, 0xad}, - {0x5f1c, 0x74}, - {0x5f2d, 0x25}, - {0x5f5c, 0xd0}, - {0x6a22, 0x00}, - {0x6a23, 0x1d}, - {0x7ba8, 0x00}, - {0x7ba9, 0x00}, - {0x886b, 0x00}, - {0x9002, 0x0a}, - {0x9004, 0x1a}, - {0x9214, 0x93}, - {0x9215, 0x69}, - {0x9216, 0x93}, - {0x9217, 0x6b}, - {0x9218, 0x93}, - {0x9219, 0x6d}, - {0x921a, 0x57}, - {0x921b, 0x58}, - {0x921c, 0x57}, - {0x921d, 0x59}, - {0x921e, 0x57}, - {0x921f, 0x5a}, - {0x9220, 0x57}, - {0x9221, 0x5b}, - {0x9222, 0x93}, - {0x9223, 0x02}, - {0x9224, 0x93}, - {0x9225, 0x03}, - {0x9226, 0x93}, - {0x9227, 0x04}, - {0x9228, 0x93}, - {0x9229, 0x05}, - {0x922a, 0x98}, - {0x922b, 0x21}, - {0x922c, 0xb2}, - {0x922d, 0xdb}, - {0x922e, 0xb2}, - {0x922f, 0xdc}, - {0x9230, 0xb2}, - {0x9231, 0xdd}, - {0x9232, 0xe2}, - {0x9233, 0xe1}, - {0x9234, 0xb2}, - {0x9235, 0xe2}, - {0x9236, 0xb2}, - {0x9237, 0xe3}, - {0x9238, 0xb7}, - {0x9239, 0xb9}, - {0x923a, 0xb7}, - {0x923b, 0xbb}, - {0x923c, 0xb7}, - {0x923d, 0xbc}, - {0x923e, 0xb7}, - {0x923f, 0xc5}, - {0x9240, 0xb7}, - {0x9241, 0xc7}, - {0x9242, 0xb7}, - {0x9243, 0xc9}, - {0x9244, 0x98}, - {0x9245, 0x56}, - {0x9246, 0x98}, - {0x9247, 0x55}, - {0x9380, 0x00}, - {0x9381, 0x62}, - {0x9382, 0x00}, - {0x9383, 0x56}, - {0x9384, 0x00}, - {0x9385, 0x52}, - {0x9388, 0x00}, - {0x9389, 0x55}, - {0x938a, 0x00}, - {0x938b, 0x55}, - {0x938c, 0x00}, - {0x938d, 0x41}, - {0x5078, 0x01}, - {0x0112, 0x0a}, - {0x0113, 0x0a}, - {0x0114, 0x03}, - {0x0342, 0x11}, - {0x0343, 0xa0}, - {0x0340, 0x0d}, - {0x0341, 0xda}, - {0x3210, 0x00}, - {0x0344, 0x00}, - {0x0345, 0x00}, - {0x0346, 0x00}, - {0x0347, 0x00}, - {0x0348, 0x0f}, - {0x0349, 0xd7}, - {0x034a, 0x0b}, - {0x034b, 0xdf}, - {0x00e3, 0x00}, - {0x00e4, 0x00}, - {0x00e5, 0x01}, - {0x00fc, 0x0a}, - {0x00fd, 0x0a}, - {0x00fe, 0x0a}, - {0x00ff, 0x0a}, - {0xe013, 0x00}, - {0x0220, 0x00}, - {0x0221, 0x11}, - {0x0381, 0x01}, - {0x0383, 0x01}, - {0x0385, 0x01}, - {0x0387, 0x01}, - {0x0900, 0x00}, - {0x0901, 0x11}, - {0x0902, 0x00}, - {0x3140, 0x02}, - {0x3241, 0x11}, - {0x3250, 0x03}, - {0x3e10, 0x00}, - {0x3e11, 0x00}, - {0x3f0d, 0x00}, - {0x3f42, 0x00}, - {0x3f43, 0x00}, - {0x0401, 0x00}, - {0x0404, 0x00}, - {0x0405, 0x10}, - {0x0408, 0x00}, - {0x0409, 0x00}, - {0x040a, 0x00}, - {0x040b, 0x00}, - {0x040c, 0x0f}, - {0x040d, 0xd8}, - {0x040e, 0x0b}, - {0x040f, 0xe0}, - {0x034c, 0x0f}, - {0x034d, 0xd8}, - {0x034e, 0x0b}, - {0x034f, 0xe0}, - {0x0301, 0x05}, - {0x0303, 0x02}, - {0x0305, 0x04}, - {0x0306, 0x00}, - {0x0307, 0xc8}, - {0x0309, 0x0a}, - {0x030b, 0x01}, - {0x030d, 0x02}, - {0x030e, 0x01}, - {0x030f, 0x5e}, - {0x0310, 0x00}, - {0x0820, 0x12}, - {0x0821, 0xc0}, - {0x0822, 0x00}, - {0x0823, 0x00}, - {0x3e20, 0x01}, - {0x3e37, 0x00}, - {0x3f50, 0x00}, - {0x3f56, 0x00}, - {0x3f57, 0xe2}, - {0x3c0a, 0x5a}, - {0x3c0b, 0x55}, - {0x3c0c, 0x28}, - {0x3c0d, 0x07}, - {0x3c0e, 0xff}, - {0x3c0f, 0x00}, - {0x3c10, 0x00}, - {0x3c11, 0x02}, - {0x3c12, 0x00}, - {0x3c13, 0x03}, - {0x3c14, 0x00}, - {0x3c15, 0x00}, - {0x3c16, 0x0c}, - {0x3c17, 0x0c}, - {0x3c18, 0x0c}, - {0x3c19, 0x0a}, - {0x3c1a, 0x0a}, - {0x3c1b, 0x0a}, - {0x3c1c, 0x00}, - {0x3c1d, 0x00}, - {0x3c1e, 0x00}, - {0x3c1f, 0x00}, - {0x3c20, 0x00}, - {0x3c21, 0x00}, - {0x3c22, 0x3f}, - {0x3c23, 0x0a}, - {0x3e35, 0x01}, - {0x3f4a, 0x03}, - {0x3f4b, 0xbf}, - {0x3f26, 0x00}, - {0x0202, 0x0d}, - {0x0203, 0xc4}, - {0x0204, 0x00}, - {0x0205, 0x00}, - {0x020e, 0x01}, - {0x020f, 0x00}, - {0x0210, 0x01}, - {0x0211, 0x00}, - {0x0212, 0x01}, - {0x0213, 0x00}, - {0x0214, 0x01}, - {0x0215, 0x00}, - {0xbcf1, 0x00}, +static const struct cci_reg_sequence mode_4056x3040_regs[] =3D { + { CCI_REG8(0x0136), 0x18 }, + { CCI_REG8(0x0137), 0x00 }, + { CCI_REG8(0x3c7e), 0x08 }, + { CCI_REG8(0x3c7f), 0x02 }, + { CCI_REG8(0x38a8), 0x1f }, + { CCI_REG8(0x38a9), 0xff }, + { CCI_REG8(0x38aa), 0x1f }, + { CCI_REG8(0x38ab), 0xff }, + { CCI_REG8(0x55d4), 0x00 }, + { CCI_REG8(0x55d5), 0x00 }, + { CCI_REG8(0x55d6), 0x07 }, + { CCI_REG8(0x55d7), 0xff }, + { CCI_REG8(0x55e8), 0x07 }, + { CCI_REG8(0x55e9), 0xff }, + { CCI_REG8(0x55ea), 0x00 }, + { CCI_REG8(0x55eb), 0x00 }, + { CCI_REG8(0x575c), 0x07 }, + { CCI_REG8(0x575d), 0xff }, + { CCI_REG8(0x575e), 0x00 }, + { CCI_REG8(0x575f), 0x00 }, + { CCI_REG8(0x5764), 0x00 }, + { CCI_REG8(0x5765), 0x00 }, + { CCI_REG8(0x5766), 0x07 }, + { CCI_REG8(0x5767), 0xff }, + { CCI_REG8(0x5974), 0x04 }, + { CCI_REG8(0x5975), 0x01 }, + { CCI_REG8(0x5f10), 0x09 }, + { CCI_REG8(0x5f11), 0x92 }, + { CCI_REG8(0x5f12), 0x32 }, + { CCI_REG8(0x5f13), 0x72 }, + { CCI_REG8(0x5f14), 0x16 }, + { CCI_REG8(0x5f15), 0xba }, + { CCI_REG8(0x5f17), 0x13 }, + { CCI_REG8(0x5f18), 0x24 }, + { CCI_REG8(0x5f19), 0x60 }, + { CCI_REG8(0x5f1a), 0xe3 }, + { CCI_REG8(0x5f1b), 0xad }, + { CCI_REG8(0x5f1c), 0x74 }, + { CCI_REG8(0x5f2d), 0x25 }, + { CCI_REG8(0x5f5c), 0xd0 }, + { CCI_REG8(0x6a22), 0x00 }, + { CCI_REG8(0x6a23), 0x1d }, + { CCI_REG8(0x7ba8), 0x00 }, + { CCI_REG8(0x7ba9), 0x00 }, + { CCI_REG8(0x886b), 0x00 }, + { CCI_REG8(0x9002), 0x0a }, + { CCI_REG8(0x9004), 0x1a }, + { CCI_REG8(0x9214), 0x93 }, + { CCI_REG8(0x9215), 0x69 }, + { CCI_REG8(0x9216), 0x93 }, + { CCI_REG8(0x9217), 0x6b }, + { CCI_REG8(0x9218), 0x93 }, + { CCI_REG8(0x9219), 0x6d }, + { CCI_REG8(0x921a), 0x57 }, + { CCI_REG8(0x921b), 0x58 }, + { CCI_REG8(0x921c), 0x57 }, + { CCI_REG8(0x921d), 0x59 }, + { CCI_REG8(0x921e), 0x57 }, + { CCI_REG8(0x921f), 0x5a }, + { CCI_REG8(0x9220), 0x57 }, + { CCI_REG8(0x9221), 0x5b }, + { CCI_REG8(0x9222), 0x93 }, + { CCI_REG8(0x9223), 0x02 }, + { CCI_REG8(0x9224), 0x93 }, + { CCI_REG8(0x9225), 0x03 }, + { CCI_REG8(0x9226), 0x93 }, + { CCI_REG8(0x9227), 0x04 }, + { CCI_REG8(0x9228), 0x93 }, + { CCI_REG8(0x9229), 0x05 }, + { CCI_REG8(0x922a), 0x98 }, + { CCI_REG8(0x922b), 0x21 }, + { CCI_REG8(0x922c), 0xb2 }, + { CCI_REG8(0x922d), 0xdb }, + { CCI_REG8(0x922e), 0xb2 }, + { CCI_REG8(0x922f), 0xdc }, + { CCI_REG8(0x9230), 0xb2 }, + { CCI_REG8(0x9231), 0xdd }, + { CCI_REG8(0x9232), 0xe2 }, + { CCI_REG8(0x9233), 0xe1 }, + { CCI_REG8(0x9234), 0xb2 }, + { CCI_REG8(0x9235), 0xe2 }, + { CCI_REG8(0x9236), 0xb2 }, + { CCI_REG8(0x9237), 0xe3 }, + { CCI_REG8(0x9238), 0xb7 }, + { CCI_REG8(0x9239), 0xb9 }, + { CCI_REG8(0x923a), 0xb7 }, + { CCI_REG8(0x923b), 0xbb }, + { CCI_REG8(0x923c), 0xb7 }, + { CCI_REG8(0x923d), 0xbc }, + { CCI_REG8(0x923e), 0xb7 }, + { CCI_REG8(0x923f), 0xc5 }, + { CCI_REG8(0x9240), 0xb7 }, + { CCI_REG8(0x9241), 0xc7 }, + { CCI_REG8(0x9242), 0xb7 }, + { CCI_REG8(0x9243), 0xc9 }, + { CCI_REG8(0x9244), 0x98 }, + { CCI_REG8(0x9245), 0x56 }, + { CCI_REG8(0x9246), 0x98 }, + { CCI_REG8(0x9247), 0x55 }, + { CCI_REG8(0x9380), 0x00 }, + { CCI_REG8(0x9381), 0x62 }, + { CCI_REG8(0x9382), 0x00 }, + { CCI_REG8(0x9383), 0x56 }, + { CCI_REG8(0x9384), 0x00 }, + { CCI_REG8(0x9385), 0x52 }, + { CCI_REG8(0x9388), 0x00 }, + { CCI_REG8(0x9389), 0x55 }, + { CCI_REG8(0x938a), 0x00 }, + { CCI_REG8(0x938b), 0x55 }, + { CCI_REG8(0x938c), 0x00 }, + { CCI_REG8(0x938d), 0x41 }, + { CCI_REG8(0x5078), 0x01 }, + { CCI_REG8(0x0112), 0x0a }, + { CCI_REG8(0x0113), 0x0a }, + { CCI_REG8(0x0114), 0x03 }, + { CCI_REG8(0x0342), 0x11 }, + { CCI_REG8(0x0343), 0xa0 }, + { CCI_REG8(0x0340), 0x0d }, + { CCI_REG8(0x0341), 0xda }, + { CCI_REG8(0x3210), 0x00 }, + { CCI_REG8(0x0344), 0x00 }, + { CCI_REG8(0x0345), 0x00 }, + { CCI_REG8(0x0346), 0x00 }, + { CCI_REG8(0x0347), 0x00 }, + { CCI_REG8(0x0348), 0x0f }, + { CCI_REG8(0x0349), 0xd7 }, + { CCI_REG8(0x034a), 0x0b }, + { CCI_REG8(0x034b), 0xdf }, + { CCI_REG8(0x00e3), 0x00 }, + { CCI_REG8(0x00e4), 0x00 }, + { CCI_REG8(0x00e5), 0x01 }, + { CCI_REG8(0x00fc), 0x0a }, + { CCI_REG8(0x00fd), 0x0a }, + { CCI_REG8(0x00fe), 0x0a }, + { CCI_REG8(0x00ff), 0x0a }, + { CCI_REG8(0xe013), 0x00 }, + { CCI_REG8(0x0220), 0x00 }, + { CCI_REG8(0x0221), 0x11 }, + { CCI_REG8(0x0381), 0x01 }, + { CCI_REG8(0x0383), 0x01 }, + { CCI_REG8(0x0385), 0x01 }, + { CCI_REG8(0x0387), 0x01 }, + { CCI_REG8(0x0900), 0x00 }, + { CCI_REG8(0x0901), 0x11 }, + { CCI_REG8(0x0902), 0x00 }, + { CCI_REG8(0x3140), 0x02 }, + { CCI_REG8(0x3241), 0x11 }, + { CCI_REG8(0x3250), 0x03 }, + { CCI_REG8(0x3e10), 0x00 }, + { CCI_REG8(0x3e11), 0x00 }, + { CCI_REG8(0x3f0d), 0x00 }, + { CCI_REG8(0x3f42), 0x00 }, + { CCI_REG8(0x3f43), 0x00 }, + { CCI_REG8(0x0401), 0x00 }, + { CCI_REG8(0x0404), 0x00 }, + { CCI_REG8(0x0405), 0x10 }, + { CCI_REG8(0x0408), 0x00 }, + { CCI_REG8(0x0409), 0x00 }, + { CCI_REG8(0x040a), 0x00 }, + { CCI_REG8(0x040b), 0x00 }, + { CCI_REG8(0x040c), 0x0f }, + { CCI_REG8(0x040d), 0xd8 }, + { CCI_REG8(0x040e), 0x0b }, + { CCI_REG8(0x040f), 0xe0 }, + { CCI_REG8(0x034c), 0x0f }, + { CCI_REG8(0x034d), 0xd8 }, + { CCI_REG8(0x034e), 0x0b }, + { CCI_REG8(0x034f), 0xe0 }, + { CCI_REG8(0x0301), 0x05 }, + { CCI_REG8(0x0303), 0x02 }, + { CCI_REG8(0x0305), 0x04 }, + { CCI_REG8(0x0306), 0x00 }, + { CCI_REG8(0x0307), 0xc8 }, + { CCI_REG8(0x0309), 0x0a }, + { CCI_REG8(0x030b), 0x01 }, + { CCI_REG8(0x030d), 0x02 }, + { CCI_REG8(0x030e), 0x01 }, + { CCI_REG8(0x030f), 0x5e }, + { CCI_REG8(0x0310), 0x00 }, + { CCI_REG8(0x0820), 0x12 }, + { CCI_REG8(0x0821), 0xc0 }, + { CCI_REG8(0x0822), 0x00 }, + { CCI_REG8(0x0823), 0x00 }, + { CCI_REG8(0x3e20), 0x01 }, + { CCI_REG8(0x3e37), 0x00 }, + { CCI_REG8(0x3f50), 0x00 }, + { CCI_REG8(0x3f56), 0x00 }, + { CCI_REG8(0x3f57), 0xe2 }, + { CCI_REG8(0x3c0a), 0x5a }, + { CCI_REG8(0x3c0b), 0x55 }, + { CCI_REG8(0x3c0c), 0x28 }, + { CCI_REG8(0x3c0d), 0x07 }, + { CCI_REG8(0x3c0e), 0xff }, + { CCI_REG8(0x3c0f), 0x00 }, + { CCI_REG8(0x3c10), 0x00 }, + { CCI_REG8(0x3c11), 0x02 }, + { CCI_REG8(0x3c12), 0x00 }, + { CCI_REG8(0x3c13), 0x03 }, + { CCI_REG8(0x3c14), 0x00 }, + { CCI_REG8(0x3c15), 0x00 }, + { CCI_REG8(0x3c16), 0x0c }, + { CCI_REG8(0x3c17), 0x0c }, + { CCI_REG8(0x3c18), 0x0c }, + { CCI_REG8(0x3c19), 0x0a }, + { CCI_REG8(0x3c1a), 0x0a }, + { CCI_REG8(0x3c1b), 0x0a }, + { CCI_REG8(0x3c1c), 0x00 }, + { CCI_REG8(0x3c1d), 0x00 }, + { CCI_REG8(0x3c1e), 0x00 }, + { CCI_REG8(0x3c1f), 0x00 }, + { CCI_REG8(0x3c20), 0x00 }, + { CCI_REG8(0x3c21), 0x00 }, + { CCI_REG8(0x3c22), 0x3f }, + { CCI_REG8(0x3c23), 0x0a }, + { CCI_REG8(0x3e35), 0x01 }, + { CCI_REG8(0x3f4a), 0x03 }, + { CCI_REG8(0x3f4b), 0xbf }, + { CCI_REG8(0x3f26), 0x00 }, + { CCI_REG8(0x0202), 0x0d }, + { CCI_REG8(0x0203), 0xc4 }, + { CCI_REG8(0x0204), 0x00 }, + { CCI_REG8(0x0205), 0x00 }, + { CCI_REG8(0x020e), 0x01 }, + { CCI_REG8(0x020f), 0x00 }, + { CCI_REG8(0x0210), 0x01 }, + { CCI_REG8(0x0211), 0x00 }, + { CCI_REG8(0x0212), 0x01 }, + { CCI_REG8(0x0213), 0x00 }, + { CCI_REG8(0x0214), 0x01 }, + { CCI_REG8(0x0215), 0x00 }, + { CCI_REG8(0xbcf1), 0x00 }, }; /* Supported sensor mode configurations */ @@ -417,97 +410,6 @@ static inline struct imx412 *to_imx412(struct v4l2_sub= dev *subdev) return container_of(subdev, struct imx412, sd); } -/** - * imx412_read_reg() - Read registers. - * @imx412: pointer to imx412 device - * @reg: register address - * @len: length of bytes to read. Max supported bytes is 4 - * @val: pointer to register value to be filled. - * - * Return: 0 if successful, error code otherwise. - */ -static int imx412_read_reg(struct imx412 *imx412, u16 reg, u32 len, u32 *v= al) -{ - struct i2c_client *client =3D v4l2_get_subdevdata(&imx412->sd); - struct i2c_msg msgs[2] =3D {0}; - u8 addr_buf[2] =3D {0}; - u8 data_buf[4] =3D {0}; - int ret; - - if (WARN_ON(len > 4)) - return -EINVAL; - - put_unaligned_be16(reg, addr_buf); - - /* Write register address */ - msgs[0].addr =3D client->addr; - msgs[0].flags =3D 0; - msgs[0].len =3D ARRAY_SIZE(addr_buf); - msgs[0].buf =3D addr_buf; - - /* Read data from register */ - msgs[1].addr =3D client->addr; - msgs[1].flags =3D I2C_M_RD; - msgs[1].len =3D len; - msgs[1].buf =3D &data_buf[4 - len]; - - ret =3D i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs)); - if (ret !=3D ARRAY_SIZE(msgs)) - return -EIO; - - *val =3D get_unaligned_be32(data_buf); - - return 0; -} - -/** - * imx412_write_reg() - Write register - * @imx412: pointer to imx412 device - * @reg: register address - * @len: length of bytes. Max supported bytes is 4 - * @val: register value - * - * Return: 0 if successful, error code otherwise. - */ -static int imx412_write_reg(struct imx412 *imx412, u16 reg, u32 len, u32 v= al) -{ - struct i2c_client *client =3D v4l2_get_subdevdata(&imx412->sd); - u8 buf[6] =3D {0}; - - if (WARN_ON(len > 4)) - return -EINVAL; - - put_unaligned_be16(reg, buf); - put_unaligned_be32(val << (8 * (4 - len)), buf + 2); - if (i2c_master_send(client, buf, len + 2) !=3D len + 2) - return -EIO; - - return 0; -} - -/** - * imx412_write_regs() - Write a list of registers - * @imx412: pointer to imx412 device - * @regs: list of registers to be written - * @len: length of registers array - * - * Return: 0 if successful, error code otherwise. - */ -static int imx412_write_regs(struct imx412 *imx412, - const struct imx412_reg *regs, u32 len) -{ - unsigned int i; - int ret; - - for (i =3D 0; i < len; i++) { - ret =3D imx412_write_reg(imx412, regs[i].address, 1, regs[i].val); - if (ret) - return ret; - } - - return 0; -} - /** * imx412_update_controls() - Update control ranges based on streaming mode * @imx412: pointer to imx412 device @@ -543,29 +445,25 @@ static int imx412_update_controls(struct imx412 *imx4= 12, static int imx412_update_exp_gain(struct imx412 *imx412, u32 exposure, u32= gain) { u32 lpfr; - int ret; + int ret =3D 0; + int ret_hold; lpfr =3D imx412->vblank + imx412->cur_mode->height; dev_dbg(imx412->dev, "Set exp %u, analog gain %u, lpfr %u\n", exposure, gain, lpfr); - ret =3D imx412_write_reg(imx412, IMX412_REG_HOLD, 1, 1); - if (ret) - return ret; + cci_write(imx412->cci, IMX412_REG_HOLD, 1, &ret); - ret =3D imx412_write_reg(imx412, IMX412_REG_LPFR, 2, lpfr); - if (ret) - goto error_release_group_hold; + cci_write(imx412->cci, IMX412_REG_LPFR, lpfr, &ret); - ret =3D imx412_write_reg(imx412, IMX412_REG_EXPOSURE_CIT, 2, exposure); - if (ret) - goto error_release_group_hold; + cci_write(imx412->cci, IMX412_REG_EXPOSURE_CIT, exposure, &ret); - ret =3D imx412_write_reg(imx412, IMX412_REG_AGAIN, 2, gain); + cci_write(imx412->cci, IMX412_REG_AGAIN, gain, &ret); -error_release_group_hold: - imx412_write_reg(imx412, IMX412_REG_HOLD, 1, 0); + ret_hold =3D cci_write(imx412->cci, IMX412_REG_HOLD, 0, NULL); + if (ret_hold) + return ret_hold; return ret; } @@ -800,8 +698,8 @@ static int imx412_start_streaming(struct imx412 *imx412) /* Write sensor mode registers */ reg_list =3D &imx412->cur_mode->reg_list; - ret =3D imx412_write_regs(imx412, reg_list->regs, - reg_list->num_of_regs); + ret =3D cci_multi_reg_write(imx412->cci, reg_list->regs, + reg_list->num_of_regs, NULL); if (ret) { dev_err(imx412->dev, "fail to write initial registers\n"); return ret; @@ -818,8 +716,8 @@ static int imx412_start_streaming(struct imx412 *imx412) usleep_range(7400, 8000); /* Start streaming */ - ret =3D imx412_write_reg(imx412, IMX412_REG_MODE_SELECT, - 1, IMX412_MODE_STREAMING); + ret =3D cci_write(imx412->cci, IMX412_REG_MODE_SELECT, + IMX412_MODE_STREAMING, NULL); if (ret) { dev_err(imx412->dev, "fail to start streaming\n"); return ret; @@ -836,8 +734,8 @@ static int imx412_start_streaming(struct imx412 *imx412) */ static int imx412_stop_streaming(struct imx412 *imx412) { - return imx412_write_reg(imx412, IMX412_REG_MODE_SELECT, - 1, IMX412_MODE_STANDBY); + return cci_write(imx412->cci, IMX412_REG_MODE_SELECT, + IMX412_MODE_STANDBY, NULL); } /** @@ -888,16 +786,18 @@ static int imx412_set_stream(struct v4l2_subdev *sd, = int enable) static int imx412_detect(struct imx412 *imx412) { int ret; - u32 val; + u64 val; - ret =3D imx412_read_reg(imx412, IMX412_REG_ID, 2, &val); + ret =3D cci_read(imx412->cci, IMX412_REG_ID, &val, NULL); if (ret) - return ret; + return dev_err_probe(imx412->dev, ret, + "failed to read chip id %x\n", + IMX412_ID); if (val !=3D IMX412_ID) { - dev_err(imx412->dev, "chip id mismatch: %x!=3D%x\n", - IMX412_ID, val); - return -ENXIO; + return dev_err_probe(imx412->dev, -ENODEV, + "chip id mismatch: %x!=3D%llx", + IMX412_ID, val); } return 0; @@ -1180,6 +1080,11 @@ static int imx412_probe(struct i2c_client *client) if (!name) return -ENODEV; + imx412->cci =3D devm_cci_regmap_init_i2c(client, 16); + if (IS_ERR(imx412->cci)) + return dev_err_probe(imx412->dev, PTR_ERR(imx412->cci), + "Failed to init CCI\n"); + /* Initialize subdev */ v4l2_i2c_subdev_init(&imx412->sd, client, &imx412_subdev_ops); imx412->sd.internal_ops =3D &imx412_internal_ops; -- 2.34.1 From nobody Tue Apr 7 08:11:14 2026 Received: from PNYPR01CU001.outbound.protection.outlook.com (mail-centralindiaazon11020072.outbound.protection.outlook.com [52.101.225.72]) (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 A558E248F47; Sat, 14 Mar 2026 12:25:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.225.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491131; cv=fail; b=SPU8N1HD/WDswcPPAfP9X4SZVGakoEEqdaoLHf8Xk+10HAb2CukH0etwEoV13kE7Xr/FkHgNDARQIQeOMnh8pYnyM8kskAYe7HzUYV40qqaCNw1fC1FKx+VNazLRcZL4ovoUTNeSOnmy9rWAZqAzDpCKVLcSeVXIFzSJ/P+zo2w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491131; c=relaxed/simple; bh=YiiLGiCPsC0eKiAMf0BRK4ltNmxEOifXjndR9UoARio=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=FWdmtgP84aBnp4izOxjlXjJsDwHFatbFEeMK7dnKb4wi/F+V3CiXgKCK+ocuSwgv6HtQcfflVFR945dvG2H8iJQWzbHXusYO/8NBddbb8lKVDhERw3t6CfFNKyvWh6iMmtZ3qHnpfRcd/fxf/mcRgqhwPSKo2xUmwoqjIE+gXwI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io; spf=pass smtp.mailfrom=siliconsignals.io; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b=UMjsmbws; arc=fail smtp.client-ip=52.101.225.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b="UMjsmbws" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WQIrXwEkcoo0zaihYGAka7YjBAxCVSRmpyI8kdVbqkDbggPPuPEQAek3IfB0ha1W3Ge3TerInT+xt5MTyplPMhlXf7MMxQsD+GEC7MMnJUu7VyBOMe3WRDUbW41c0EcELVyxEpbFRgiT1RLVTKLRC2MjgOPG8EntwMoKD00mHElhuJ+NYIN3fHrfIt/Zvk9YlNoewZrhbjYPFfvCw7k82pFbPsFNuRbsIyBL+isuWzjy5FIqqwiCslPbIP1uaKmE2vIG1x10ElSnZPY30kqWxTed8YEYeiqqyPNavgxoXmbEelmdbo+N5Qnlhme0BFbbgjkdmOFf76Rl35pczwKwaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9VxS0kernEH0IG0o63qhvZd22JAL/AatWDzHCCD0QZE=; b=s6yHm3rOE0vLz9msqmC1wdnmUBaSNaezoIE9e5g6JwD6UDfkhPvdoUrSCsGEra1ck3a1H0D9FZ9yYo52mtaU1YtvQk8avITEmAhavIErWv+u5BVEyOYtMsVy+7cajI+RV9tRXOzNszyrNaR61IN+Gi0vuqmZZsDUgE9yJndStOoIpJLoCGnRug/misTV8aV/PhG4RZm1UOKJ2O6f4pQPjCC+510kNEwkhzHNsXHKgEt64Aitphs3mayjmcBbyzGvpyIH+F+OR2DcPeXKfIvLYgRvcASkSKQz3YhWcNt1rfMGMJ2dz9gE7bwsm+KKx1umlOhb2ysHk7eYZYq7dJZzhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siliconsignals.io; dmarc=pass action=none header.from=siliconsignals.io; dkim=pass header.d=siliconsignals.io; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siliconsignals.io; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9VxS0kernEH0IG0o63qhvZd22JAL/AatWDzHCCD0QZE=; b=UMjsmbws/NeE0dtvDxN1A/pfq9rA5zXysAD1v8ADew7f3CBvIrEjSerMH1D1wD9Z76ICYhsz1ARXlnVZ8/l4tpffafVB+6bYCP3lMHqKXRybkIysB94D49JM/3XH571A9C/bXjOX+9gyoabWzGsdFzyR8DiiWj/W4QtIhowXUPxPAfuk+IZ2wKzz4FScYQjn87GVC3xDBzCgcdhiCOsPB5O7sUF/JMhH4Yad1LBAXfiNArQQUYJbWL9nHW4WDNg9zBo4rsRak+fVpUlAyIMvoVlZwd5qPTDnIjmV6kT2u1je1uodou2LuHC+WiuutFzjhMmd0jiErqDtHKzGiLNrQg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siliconsignals.io; Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) by MA0P287MB0466.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:bf::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.19; Sat, 14 Mar 2026 12:25:26 +0000 Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7]) by PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7%5]) with mapi id 15.20.9700.018; Sat, 14 Mar 2026 12:25:26 +0000 From: Elgin Perumbilly To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: tarang.raval@siliconsignals.io, Elgin Perumbilly , Mauro Carvalho Chehab , Hans Verkuil , Hans de Goede , Vladimir Zapolskiy , Mehdi Djait , Laurent Pinchart , Xiaolei Wang , Sylvain Petinot , Benjamin Mugnier , Jingjing Xiong , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] media: i2c: imx412: Switch to using the sub-device state lock Date: Sat, 14 Mar 2026 17:54:38 +0530 Message-Id: <20260314122442.109356-3-elgin.perumbilly@siliconsignals.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> References: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1P287CA0013.INDP287.PROD.OUTLOOK.COM (2603:1096:b00:40::32) To PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PN3P287MB2188:EE_|MA0P287MB0466:EE_ X-MS-Office365-Filtering-Correlation-Id: 58568ac4-acb0-4a52-2705-08de81c4c5a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: o8AWqWNTyAo+CdLXA4JHn8HjyzdAzJDBL84A242uc/gGyW1bfeZVyy/kxnIwZbMOUNNBXYpau09YpRo394YQdiArJu/oCPZuj/Lxczr3oEAYGshgBncgvG2rjAb9eFs9Rlt/RAJ+qFdp/TGJBcruzcq+qvtwLj0jgBPi7qXPSZW1fpsCjmhxu9i6B/CdbvPbvIRJMF4A/2R7c/LEIukylYDXdJrJ3p33+ZVOwX097wmdvlCRWkaR+v664yyIltDAB25Dwm8BDmXC0PuJWtQYg98larlvFgAE0ShAYpj67AYH6VZ/orPN/7/Vraz98f/81PZ4DY6X5s0c53bzPn1/F3+dj8wOlMZKgxXY3n8NT+raeJH/QU4WidyMBDEaqxOhsD/lbhQM6DIDIuILX4ecJXMP+07d5f4WYo3bH1BJnyXeowqU2/RolZN1+90HHYcvgPokM5643XjUNbzC48yC1M/CBJehD1poWhiObO0tW8q+0z1jcaSw5NIJ5F2KYV4c+3sEJId1XpJkkoNFAIcYBRweTpPtI+RgdaLznfZVKn9sKxHECM/qhfbHaplcPRPkYpYza1faELp0jjz+ZAxpmR46S8kVj2tOXnHCUkbK3amLsDGK6UNpocbc03jrUbrDzu8i7EBrnp+rvfZLTsc6rhpu95jf9QfOnggShbGG9Uxp5uwEf9J7C/25kJcY+URsc7/VTyJ3hvU441yBsO7TJyUXmPZVgiRcGhx5+VthKppdP9YGiV/HPI+KeRbf0NBKcLFyOzTQZM17Mqg3emtByEdo31k2jfeWOrZI4qtqOxY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3P287MB2188.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BtUI282cfRMnUs2iKMEAOChYC1POlZRoZ1+pGVyR1x1U/lFA0d16XL7QYQMt?= =?us-ascii?Q?AwpXqRoWjig0oJhQ/aNL/4YDsHlaJUmXDzhF9b1Ubqt6E4wNuTHkET3YYbbB?= =?us-ascii?Q?8ZXJJ3Z5Sv91JByuiaLJiTVRYPYzJ8+8JMHAUDsKgPXwOQtBBQ0g4lhFxkXO?= =?us-ascii?Q?keTNsjZ4Pu6bHySKonfpTCFd+e1dm9oxwA1Or72sVWZDwuTyF+7cVj0LmypW?= =?us-ascii?Q?1p//SKJn7Edk7FT+weNaY2vlg23qQCfEdbRZUnxilAzm+QqoOu81GTPF2WBj?= =?us-ascii?Q?1mn1pp6RnA4c22/nVQwa8wTP1qkG3u9uhxcBvwpsZew5QomjGKbciu9dUM/P?= =?us-ascii?Q?3S6XmJp+qfyr4giFzbaQTPuzLeS5tcttOnXA6s4Tv5cWdxLdk0Fat1I731IQ?= =?us-ascii?Q?8rdEFyILnUbT7nvlHq/G2J0sdmEBWXzGrRCHwTghkHhXU15VXyaDL5m9CJDP?= =?us-ascii?Q?R5Yhrd+YK3+dS12EIhqZtDmcHj9hOlcoE39gTY3CZVrXdyXCETJjaeKqJVZr?= =?us-ascii?Q?8jF01bDhQleUBJfSt9ER9zFIYKF4laskxdOeLzz/xiMUy49wk+SG+dyoRNnA?= =?us-ascii?Q?JowFmf7YeNERa170Yv4CtJ9vaA1gKB7Y1A/rG+05YYxE8hval7DgyCCfCp2E?= =?us-ascii?Q?XHAjIrzYEdrP6nt6fdvrnX5q+Cku4UwT3VqepyCS8J5hTZhpRVWFWocbvrZu?= =?us-ascii?Q?lvFWa6OnK7nTEQbHJAOnKv/myBze0expuNUbgQYnMh7OBLhadjbp/UpW2GWI?= =?us-ascii?Q?l3BqqRzyrznYOLWR3iSl3JGaCPzUCVaJWA6t8dFUdO2cwXbq0A7Iy7BufZkv?= =?us-ascii?Q?NX74kZjpLSNziP98sgXnQdWWVkr8WG9qa+gR5twuh9eg629zl5HIVwgrTHYG?= =?us-ascii?Q?MNQi/kpPpHA6thKt4vQfMbS7e8GSs++zQnoZiVNnFXVjxtjv8RMGRnysH2sl?= =?us-ascii?Q?eWPj6iLljVN73vTcwSZ4NRnxdVvKFOKgYCnGOSmXanfkNfnDCQ+z2uRzYL3A?= =?us-ascii?Q?DKLYgRIL868wV1aGuxqVEJ8GB3ZERliB7FIxRP1N0jZCy8NQom7yNucbLQ0y?= =?us-ascii?Q?1b3HL8ivwLbzE8LzunlbIhxEDInvLrZhIRFd7VQ6XgmLlotT/gp1TN9v5hBL?= =?us-ascii?Q?pzHdzVe3qo9wnaPe3XVmO0xZKPi6qjkCAeP6rrB3p0l8uKqNtU6gu9tdX+M1?= =?us-ascii?Q?bDF1ssCU+gjDSxkp+TzoW+pBjV1G7KiT3KSsEzQu4KqFRWrC8eh5iXxWRqfk?= =?us-ascii?Q?Gk4UpQFEvSvz9J1Us8TnD0MXmsRM5qPxO6DVRMioR+eBn6ZKBcXutxDpDSiO?= =?us-ascii?Q?iNBYd68Zz9Dx2ANWo2a5sqgBedCZMranZz4XKHU4qbK5Vi+BT8Nzj/DHzVhB?= =?us-ascii?Q?F+p94wL+7SslLeQvb+gZcTlHOqRMdLQG9ick5QeE786W5EIxohtR0Me8ZRBn?= =?us-ascii?Q?VQfu5B/4oSqIl0XICY3hVWslJdY20Q/TifJFr3kEW86FGSWAF5k1iEyixGXQ?= =?us-ascii?Q?AdC+RJP4/Twc3zKoMYu3YVXjKSvSQ7Fe8f4XS4D04tF38EJDgw/O/3AgwB7a?= =?us-ascii?Q?37ESDoptCT2ooFB7Pp4wQxidwsBjdpnYwnnErIXnNgW0Nts0sjksfQHG24yd?= =?us-ascii?Q?IdT1e9VkaU2/UXMvo+8XhWtLEXFVIBIpgm9S5r7F6T1sHXRTK/QJikERa+Qz?= =?us-ascii?Q?6veB74uQMh3Sv1Nosopt/8H0AboE5ajlZEi/CYz0jIGYDsQ3X1LhZy7cXvXi?= =?us-ascii?Q?sfi9KwQUsElgBwPDSKzL6sFjZa8F2IM=3D?= X-OriginatorOrg: siliconsignals.io X-MS-Exchange-CrossTenant-Network-Message-Id: 58568ac4-acb0-4a52-2705-08de81c4c5a8 X-MS-Exchange-CrossTenant-AuthSource: PN3P287MB2188.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2026 12:25:26.3734 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 7ec5089e-a433-4bd1-a638-82ee62e21d37 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AJl50q+A8LdxMoHX84jj0Q1O5FWwS/h8qQaetlyNRML+jX1+9FgKrN9jnDumMwmgw7QdNVAaCu50Tpq2ZW3ztvvzPdp7X1eZ0qnp1awv1nrt987qWNrZjqVbReUStU5u X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB0466 Content-Type: text/plain; charset="utf-8" Switch to using the sub-device state lock and properly call v4l2_subdev_init_finalize() / v4l2_subdev_cleanup() on probe() / remove(). Signed-off-by: Elgin Perumbilly --- drivers/media/i2c/imx412.c | 53 +++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index 13d6fe79dcf7..ec56ccc22423 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -118,7 +118,6 @@ static const char * const imx412_supply_names[] =3D { * @again_ctrl: Pointer to analog gain control * @vblank: Vertical blanking in lines * @cur_mode: Pointer to current selected sensor mode - * @mutex: Mutex for serializing sensor controls */ struct imx412 { struct device *dev; @@ -140,7 +139,6 @@ struct imx412 { }; u32 vblank; const struct imx412_mode *cur_mode; - struct mutex mutex; }; static const s64 link_freq[] =3D { @@ -613,8 +611,6 @@ static int imx412_get_pad_format(struct v4l2_subdev *sd, { struct imx412 *imx412 =3D to_imx412(sd); - mutex_lock(&imx412->mutex); - if (fmt->which =3D=3D V4L2_SUBDEV_FORMAT_TRY) { struct v4l2_mbus_framefmt *framefmt; @@ -624,8 +620,6 @@ static int imx412_get_pad_format(struct v4l2_subdev *sd, imx412_fill_pad_format(imx412, imx412->cur_mode, fmt); } - mutex_unlock(&imx412->mutex); - return 0; } @@ -645,8 +639,6 @@ static int imx412_set_pad_format(struct v4l2_subdev *sd, const struct imx412_mode *mode; int ret =3D 0; - mutex_lock(&imx412->mutex); - mode =3D &supported_mode; imx412_fill_pad_format(imx412, mode, fmt); @@ -661,8 +653,6 @@ static int imx412_set_pad_format(struct v4l2_subdev *sd, imx412->cur_mode =3D mode; } - mutex_unlock(&imx412->mutex); - return ret; } @@ -748,9 +738,10 @@ static int imx412_stop_streaming(struct imx412 *imx412) static int imx412_set_stream(struct v4l2_subdev *sd, int enable) { struct imx412 *imx412 =3D to_imx412(sd); + struct v4l2_subdev_state *state; int ret; - mutex_lock(&imx412->mutex); + state =3D v4l2_subdev_lock_and_get_active_state(sd); if (enable) { ret =3D pm_runtime_resume_and_get(imx412->dev); @@ -765,14 +756,14 @@ static int imx412_set_stream(struct v4l2_subdev *sd, = int enable) pm_runtime_put(imx412->dev); } - mutex_unlock(&imx412->mutex); + v4l2_subdev_unlock_state(state); return 0; error_power_off: pm_runtime_put(imx412->dev); error_unlock: - mutex_unlock(&imx412->mutex); + v4l2_subdev_unlock_state(state); return ret; } @@ -991,9 +982,6 @@ static int imx412_init_controls(struct imx412 *imx412) if (ret) return ret; - /* Serialize controls with sensor device */ - ctrl_hdlr->lock =3D &imx412->mutex; - /* Initialize exposure and gain */ lpfr =3D mode->vblank + mode->height; imx412->exp_ctrl =3D v4l2_ctrl_new_std(ctrl_hdlr, @@ -1095,13 +1083,10 @@ static int imx412_probe(struct i2c_client *client) return ret; } - mutex_init(&imx412->mutex); - ret =3D imx412_power_on(imx412->dev); - if (ret) { - dev_err(imx412->dev, "failed to power-on the sensor\n"); - goto error_mutex_destroy; - } + if (ret) + return dev_err_probe(imx412->dev, ret, + "failed to power-on the sensor\n"); /* Check module identity */ ret =3D imx412_detect(imx412); @@ -1134,27 +1119,37 @@ static int imx412_probe(struct i2c_client *client) goto error_handler_free; } - ret =3D v4l2_async_register_subdev_sensor(&imx412->sd); + imx412->sd.state_lock =3D imx412->ctrl_handler.lock; + ret =3D v4l2_subdev_init_finalize(&imx412->sd); if (ret < 0) { - dev_err(imx412->dev, - "failed to register async subdev: %d\n", ret); + dev_err_probe(imx412->dev, ret, "subdev init error\n"); goto error_media_entity; } pm_runtime_set_active(imx412->dev); pm_runtime_enable(imx412->dev); + + ret =3D v4l2_async_register_subdev_sensor(&imx412->sd); + if (ret < 0) { + dev_err_probe(imx412->dev, ret, + "failed to register os05b10 sub-device\n"); + goto error_subdev_cleanup; + } + pm_runtime_idle(imx412->dev); return 0; +error_subdev_cleanup: + v4l2_subdev_cleanup(&imx412->sd); + pm_runtime_disable(imx412->dev); + pm_runtime_set_suspended(imx412->dev); error_media_entity: media_entity_cleanup(&imx412->sd.entity); error_handler_free: v4l2_ctrl_handler_free(imx412->sd.ctrl_handler); error_power_off: imx412_power_off(imx412->dev); -error_mutex_destroy: - mutex_destroy(&imx412->mutex); return ret; } @@ -1168,9 +1163,9 @@ static int imx412_probe(struct i2c_client *client) static void imx412_remove(struct i2c_client *client) { struct v4l2_subdev *sd =3D i2c_get_clientdata(client); - struct imx412 *imx412 =3D to_imx412(sd); v4l2_async_unregister_subdev(sd); + v4l2_subdev_cleanup(sd); media_entity_cleanup(&sd->entity); v4l2_ctrl_handler_free(sd->ctrl_handler); @@ -1178,8 +1173,6 @@ static void imx412_remove(struct i2c_client *client) if (!pm_runtime_status_suspended(&client->dev)) imx412_power_off(&client->dev); pm_runtime_set_suspended(&client->dev); - - mutex_destroy(&imx412->mutex); } static const struct dev_pm_ops imx412_pm_ops =3D { -- 2.34.1 From nobody Tue Apr 7 08:11:14 2026 Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazon11020110.outbound.protection.outlook.com [52.101.227.110]) (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 25C9623815D; Sat, 14 Mar 2026 12:25:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.227.110 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491137; cv=fail; b=Iamm3Yyo1Slwi7pQkPj+BT0U+zvSjyBSHCoEwG1TSwQY7ySBiH2URnYcMR3BdD/nJmTp0r2h0ImIdGlTIIMj7O4KZ6KatFvQ5hUknWpiPcGlh7afZR+6y0MBE2G0pVxZ/ijhQ56Q7AJbDKApmJSLrh+/ymGEwH1LO3r1qCuOzeU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773491137; c=relaxed/simple; bh=Y3Hmv56jiuKeSWMiNlBL32JXKJAacOEuaG4al9+5dO4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BsrqkjkGNAwmucgQc3JrGQZVstHTFn5qEqn6ebQE32ZyztOeisuODH5JFMKhOLuJB1lfEpALdIdRmi70pLruo73UBDk44PD0TiRyhMmqs9+jG27N6ZI4TwwLtYFnTAqT9knl9LO9TFk2wyccENqwbgs2lU9Zs29N2Wyv8mSFjHw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io; spf=pass smtp.mailfrom=siliconsignals.io; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b=K+11Cc0J; arc=fail smtp.client-ip=52.101.227.110 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=siliconsignals.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=siliconsignals.io header.i=@siliconsignals.io header.b="K+11Cc0J" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CsldMPtLC+KDgaQ3Yp7uky/1/+zdch9202f1teMBx94Av8HygoEfTgi2/b9/JbDIIL8PELLRZPccYF9YU7Vtx3hTL3HJuxR4bcEBSrdcxaMEknLWmWCeYyopZP8EABCfNQ7Yb0gewibTljQd7N3F6njtSDm/jprfobDECLkFv3W+EAU/WJPrDONP2FemkOfTLqwVmpswEpWYf0qE0AteHRcvxX1kGPV8fbbvIABQgIg1jqVgF+XhUBMOSAIfd4FtKgoqjpEzVUzl/3xC6uoPQt6rcMAY4VLagItZM9vp9lCw/bDkKEkgIKPEUD440ivk8JVfpzDXWBDppyQRsVeoyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XFZ6SU7i1WF+TrIUwJvR2LWMVmWtw7kD2ibC4Ior89A=; b=CbNQS9GtbObxJDYojV0B4FoDqqbUw5Yhp3APFaQ1E0d2gwLKj75bwnINAZ8Qx8I8XBo5q+eIAc9gMMDHBiwoAQRLoEbRL8R51iPpZfnwHPuM2zKWAMurWKmF38TYNb3if8FYjaL+58DwHAG9H5LYd9o755ldfW6jt5KJAmT67xNqA4ruBn+bVVTdeGf9frBvDBDIwghBChrO97ffhWWA6ABcnZQ/vxzON9jalzxzvXRFLuY/BoqzWdMOsffRgVsmIBIUgCQtaynxvgfMjYX5PLb6mGSGDHfHuE47b2D7YWPnO5csWArmj6i4KW9dAK3yx+Ir9YO8M8HsBqeTEJHLeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siliconsignals.io; dmarc=pass action=none header.from=siliconsignals.io; dkim=pass header.d=siliconsignals.io; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siliconsignals.io; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XFZ6SU7i1WF+TrIUwJvR2LWMVmWtw7kD2ibC4Ior89A=; b=K+11Cc0JVZ/lgzZiaQJBTglBqUVPWiSL3lg9pkC17lRhoWRdiiHGzqlv0e3TBA1ET6xs+MwdeH5ijq6UAD4QdJGKKrNsJtQwSRzwmZzI8IfxJ9aIUQXXM3JdnkLD7B2CJpJ24SdgC/sDRN2pQIfAizOK4+wlTeHKfGvP1g6mbqn4N4W+iJwcH41lRYrumw7JWyhDy6LGPV17O8uKzdKGwxnipyt0EQPkccCtqpvj5v1AwQMml14sl4Z/IIwUoXEOFBPzHHF0Nb50uENguwPNQe2JVWMv/OfE4MWYlWkqcKjNAkzw2BrVoCFRZ8fSYeR4zwJfc5hAxzvbeLxKc42W9g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siliconsignals.io; Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) by MA0P287MB0466.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:bf::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.19; Sat, 14 Mar 2026 12:25:33 +0000 Received: from PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7]) by PN3P287MB2188.INDP287.PROD.OUTLOOK.COM ([fe80::82b3:36a9:de62:6aa7%5]) with mapi id 15.20.9700.018; Sat, 14 Mar 2026 12:25:33 +0000 From: Elgin Perumbilly To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: tarang.raval@siliconsignals.io, Elgin Perumbilly , Mauro Carvalho Chehab , Hans Verkuil , Hans de Goede , Vladimir Zapolskiy , Mehdi Djait , Xiaolei Wang , Laurent Pinchart , Benjamin Mugnier , Sylvain Petinot , Jingjing Xiong , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] media: i2c: imx412: switch to {enable,disable}_streams Date: Sat, 14 Mar 2026 17:54:39 +0530 Message-Id: <20260314122442.109356-4-elgin.perumbilly@siliconsignals.io> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> References: <20260314122442.109356-1-elgin.perumbilly@siliconsignals.io> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1P287CA0013.INDP287.PROD.OUTLOOK.COM (2603:1096:b00:40::32) To PN3P287MB2188.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1d3::11) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PN3P287MB2188:EE_|MA0P287MB0466:EE_ X-MS-Office365-Filtering-Correlation-Id: 099fe0d6-b626-433f-be6e-08de81c4c98f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|52116014|376014|38350700014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: GxdBFdCb9ElKSNxsNlYqf5SKo2Y1F4i4Ynlg40RmDSUfSc8nMc2/bUSfCTqQyk3utysgb6nidhLtoJbJEjKIOJ2vAOEGOBF/4CTiazW0dJNd/Lscn1EgQDoOPaLCfayN2CP2B8L+/LdqU5WVsCxuOizd5nXsnbxL+ZP7Vn0P3INGC6nJD5vYLVpYQD4iuyMLb3R5IMACloM7HnzxCNw7sjKVQfyxKu7o3B6uc3/qrTE8ELeKwA5ULLD++uEGuqgyQUIdFTdS+ai5NJu5+f2Y+xzniI2mkE8gpBavWbaTRQvAqvl3faevNpyh/vbmCCD5uEUZoL8Nsv1TXbdQHQjdVXiG3HFe/RgqV8Oor2dhB7yvBwxLDcV+SgQzqb7qCNokG0b/vbuhl+pt3LEyTCNNA33qoQux74VfSU1fX30laycelgz4piSkD/ifxJWMPeNvXYOzOqN7enRpvJHAIQ2hMOIiQjTNKdVN7fDW49jq3xr12LFucbuFeMTZhmlH6EF/2of2lfqGH3pqOVu+x/Hx3vA3WSuZYSZYBJ+bABA08V2F1Ic1HAQEDg+u97d0G9LDx/3+otCl31uhU7ezfTaYmqICN3Qqeg493t1rYKc2Ff3TKpxNcE1vUa+FMDygWkY8jyjU9OHvZkdNK2GyQnpQdEeordvQ1IjsaLe1bBcmGxkMGMkjXBWSi3lFG/F2sItu7fWKuUb8+JYLAUPnseaJ1fX71EvbSsbwth19OxkDrN+qMWyQgoYqzTnmC3j/NdYMrpCc0RVONC3p5BIc5Mxf5l+//MhBlHRUkyPAucvR/tc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3P287MB2188.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(52116014)(376014)(38350700014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XplJYtugYD+jfpAcaY89TEu+H4THrrbul2fWBeuS5ZZnz1ZspBZnlyeD5O6j?= =?us-ascii?Q?mzQ8MzxraciRYSdu6ya/+CUMJAJYBqeuEf2lGUeQkuG52IlFSnwgI6aKBAXI?= =?us-ascii?Q?+vdMN9Yr4C4E1P8ZBXcjO+0jbn2DUaWMoCU2l7h9XvTlX2a+ODjUREIUgn8A?= =?us-ascii?Q?s6rRlAWpOUNMJCcE2e8+qRclpVEdZP9UyO/KfjavfmauRd2gBAx+J/Mi3zUu?= =?us-ascii?Q?u9Qvtvi1V6HTsugdwITQQ1gN/8CSeT5emn3f9xSnbDwNL6k6fUBvNFxTooOt?= =?us-ascii?Q?ABz7d+u6kxXxl2dDydXlvpNvSt6LSVzKrcGAqYAShCTd1ViIhm5e+H8YjH3S?= =?us-ascii?Q?WvKIVKSa6Lb6FPozeueT75/YuFo1oxp1K/2b2KLf9Q+lZPjEG7jx4r/fkdwV?= =?us-ascii?Q?TroGU8SY/qTPtD9sOr9Y/BJM+fN9GKJcUBu87y5XhVf4/kskfQEhntf1CzaC?= =?us-ascii?Q?b5UFgi/avy+AdnTW20Q5its1+Dowu/Fjd0EPWSLfh7xou8aysU27fAis/kBj?= =?us-ascii?Q?MIKE1BhubSIyOb6008MfmEEP7jFndFHQ5gUiFed6K11Kuk2MwsrIxVrbCSlQ?= =?us-ascii?Q?C69a9ZKgWAyhjvUzfwsghVfjsfmIcKqxhc4UuXuiC9SqR4Bl2a7ZvejXjjCp?= =?us-ascii?Q?votZETjgOMoOzez8kXTbZgLwIoANo6D0dZ3zOfWH4OnD6Ao0nQ14pA1BBhCr?= =?us-ascii?Q?feUqtfqAHTY+EYKW42CrSFa/6BBVAAToJXvt360iQdt1apwU78qpdeF7fVoP?= =?us-ascii?Q?NlzUf5gtg69uavFRUKSSFIBS2n8CABlLupJmA9fSkt7m9mVuTIdhyhkRJHgX?= =?us-ascii?Q?+3y8FpFQZ/+zHXztjCcruo6YE4NMqBij0+HnzrRikNgjDMTz+qfcoinOfQ1d?= =?us-ascii?Q?NrqEzIQbaIUYy5e4Ku/vA+MBBj0uAsLk5quh/CUsTBxyphp6tVtsrFF/rMg2?= =?us-ascii?Q?1KO/AS4gSODTsbhyNNqMmCG4fQth+r/nGNuj5qsKXtKzK97JMQ5McR3Cj91p?= =?us-ascii?Q?iinvNF2WUcP4fc4wOPoMzB+GiYtZOrB2qaktZBs0W1HA8Mbo910o01e3OBG/?= =?us-ascii?Q?RMGHsFwK0FlFiONImAChRmkjVG6QPBamY2fBRqHf8p/YZAwGqNFDuoZwcVqU?= =?us-ascii?Q?u4ywoBlqige+UasVHt/jZdgywvnPdi5jPBL1gNMz/+We3cTbHX15Ismtmxuh?= =?us-ascii?Q?kHY5akTOgLCD2/9GmiP9u7G7qSNe68q6bZRflO7ED4g4tCU/nMnjt1Td0CTQ?= =?us-ascii?Q?20NGtSVeoovACDfSW2BdDHVlmruqiVKhMqKi47nlA76mT22FdPA+S/xMC2U6?= =?us-ascii?Q?7GZqm9PA2erVSPNC1ERPs4o3sm6iKd02aUOdfyy5VfTGxlFnD7aomJtuvmao?= =?us-ascii?Q?NBIO9W/s03B6w7BrzX/yRdDqHOZbEB0QLmMe8P4Jk2GsW2KWb1v/fRYJFZD5?= =?us-ascii?Q?OCqiEjvZtNojypFNlkxfZYYCkWxtSyw2K9o4Rc7GNKFb7KogIBspHeRjHHid?= =?us-ascii?Q?ZTbZF+d3/lhOqpdpxJZ4b5hWDqFQYtATs/u7JSwISLPtqGokkvAjGdHaKhQg?= =?us-ascii?Q?2GmznHwEHuYLkgr87g7CW6Iwp5duYZ98+AsrQZlcMCB5GS+6aRO21L1PNzUT?= =?us-ascii?Q?qWab8qTWGExYhDV/jbd3JxL8sgLEWm12UPI5GzYZ7nKpf34HJPt7CuSTnP7y?= =?us-ascii?Q?flTxwmBnqGA29hNzgsuJ1w4sc2vTvhPz5WqvDd43Aux79d+L2rpChUY0uVvZ?= =?us-ascii?Q?fcbjXxuibpZVIOyi8m7QiO5ktUrHy5k=3D?= X-OriginatorOrg: siliconsignals.io X-MS-Exchange-CrossTenant-Network-Message-Id: 099fe0d6-b626-433f-be6e-08de81c4c98f X-MS-Exchange-CrossTenant-AuthSource: PN3P287MB2188.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2026 12:25:32.9407 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 7ec5089e-a433-4bd1-a638-82ee62e21d37 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BF4cX2x81B2YRaCu5cR2UT4uZru6FFX5ymInu02Wi4Z16DkwvcHC9Kjg6zFfdfyD6MShA90Z8/jPRHFr1/WzA1u2Xfs4FdqRmNhI66vJrr2+HxFTJOcXKiNB7N448oFI X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB0466 Content-Type: text/plain; charset="utf-8" Switch from s_stream to enable_streams and disable_streams callbacks. Signed-off-by: Elgin Perumbilly --- drivers/media/i2c/imx412.c | 80 +++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index ec56ccc22423..c59f375f0330 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -676,30 +676,40 @@ static int imx412_init_state(struct v4l2_subdev *sd, } /** - * imx412_start_streaming() - Start sensor stream - * @imx412: pointer to imx412 device + * imx412_enable_streams() - Enable specified streams for the sensor + * @sd: pointer to the V4L2 subdevice + * @state: pointer to the subdevice state + * @pad: pad number for which streams are enabled + * @streams_mask: bitmask specifying the streams to enable * * Return: 0 if successful, error code otherwise. */ -static int imx412_start_streaming(struct imx412 *imx412) +static int imx412_enable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask) { const struct imx412_reg_list *reg_list; + struct imx412 *imx412 =3D to_imx412(sd); int ret; + ret =3D pm_runtime_resume_and_get(imx412->dev); + if (ret < 0) + return ret; + /* Write sensor mode registers */ reg_list =3D &imx412->cur_mode->reg_list; ret =3D cci_multi_reg_write(imx412->cci, reg_list->regs, reg_list->num_of_regs, NULL); if (ret) { dev_err(imx412->dev, "fail to write initial registers\n"); - return ret; + goto err_rpm_put; } /* Setup handler will write actual exposure and gain */ ret =3D __v4l2_ctrl_handler_setup(imx412->sd.ctrl_handler); if (ret) { dev_err(imx412->dev, "fail to setup handler\n"); - return ret; + goto err_rpm_put; } /* Delay is required before streaming*/ @@ -710,62 +720,42 @@ static int imx412_start_streaming(struct imx412 *imx4= 12) IMX412_MODE_STREAMING, NULL); if (ret) { dev_err(imx412->dev, "fail to start streaming\n"); - return ret; + goto err_rpm_put; } return 0; -} -/** - * imx412_stop_streaming() - Stop sensor stream - * @imx412: pointer to imx412 device - * - * Return: 0 if successful, error code otherwise. - */ -static int imx412_stop_streaming(struct imx412 *imx412) -{ - return cci_write(imx412->cci, IMX412_REG_MODE_SELECT, - IMX412_MODE_STANDBY, NULL); +err_rpm_put: + pm_runtime_put(imx412->dev); + + return ret; } /** - * imx412_set_stream() - Enable sensor streaming - * @sd: pointer to imx412 subdevice - * @enable: set to enable sensor streaming + * imx412_disable_streams() - Enable specified streams for the sensor + * @sd: pointer to the V4L2 subdevice + * @state: pointer to the subdevice state + * @pad: pad number for which streams are disabled + * @streams_mask: bitmask specifying the streams to disable * * Return: 0 if successful, error code otherwise. */ -static int imx412_set_stream(struct v4l2_subdev *sd, int enable) +static int imx412_disable_streams(struct v4l2_subdev *sd, + struct v4l2_subdev_state *state, + u32 pad, u64 streams_mask) { struct imx412 *imx412 =3D to_imx412(sd); - struct v4l2_subdev_state *state; int ret; - state =3D v4l2_subdev_lock_and_get_active_state(sd); - - if (enable) { - ret =3D pm_runtime_resume_and_get(imx412->dev); - if (ret) - goto error_unlock; - - ret =3D imx412_start_streaming(imx412); - if (ret) - goto error_power_off; - } else { - imx412_stop_streaming(imx412); - pm_runtime_put(imx412->dev); - } - - v4l2_subdev_unlock_state(state); + ret =3D cci_write(imx412->cci, IMX412_REG_MODE_SELECT, + IMX412_MODE_STANDBY, NULL); - return 0; + if (ret) + dev_err(imx412->dev, "failed to set stream off\n"); -error_power_off: pm_runtime_put(imx412->dev); -error_unlock: - v4l2_subdev_unlock_state(state); - return ret; + return 0; } /** @@ -882,7 +872,7 @@ static int imx412_parse_hw_config(struct imx412 *imx412) /* V4l2 subdevice ops */ static const struct v4l2_subdev_video_ops imx412_video_ops =3D { - .s_stream =3D imx412_set_stream, + .s_stream =3D v4l2_subdev_s_stream_helper, }; static const struct v4l2_subdev_pad_ops imx412_pad_ops =3D { @@ -890,6 +880,8 @@ static const struct v4l2_subdev_pad_ops imx412_pad_ops = =3D { .enum_frame_size =3D imx412_enum_frame_size, .get_fmt =3D imx412_get_pad_format, .set_fmt =3D imx412_set_pad_format, + .enable_streams =3D imx412_enable_streams, + .disable_streams =3D imx412_disable_streams, }; static const struct v4l2_subdev_ops imx412_subdev_ops =3D { -- 2.34.1