From nobody Mon Nov 25 11:26:30 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2049.outbound.protection.outlook.com [40.107.21.49]) (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 264051F7549; Mon, 28 Oct 2024 19:07:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730142433; cv=fail; b=bYsqhEV+7NJM7+gtgmspZwPzvvMmaCBJT1+pdfjHQGkkBqsnftbMUweMkJ8M9Fea8F0HQnaLpWObE5dm5pNdW8GvfHLONmcW0JF3d0eGWZ0fojHcqunuOBsNDL+aMJW9lTdudYB91cATY6i7xAdLGb6Fo2DIAJ+6U+MZw/ChxtM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730142433; c=relaxed/simple; bh=dtsrfe8+u6vBoC+pkprtxJvsnvLZEtOY/uW04D0HFHA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=IiVzKZawvI44PuLTh90iBXAQ2Chk5/LcgVN9StJJAWeEeBZt/bllrq4FF8P9z5o6XzlPCPgk0tBaSBjitSv7mqpIiS53eWWnkwXXdZbo4AA3z+gKPY088yjRmks6qTXSoplkOnhP6a6feIcYD6VEgTx2fcUzuJ2eoL29NGxUF6w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=K8m9iIfr; arc=fail smtp.client-ip=40.107.21.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="K8m9iIfr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OMzdOyV23WK3m3Tt9hMFFO3PQSxedpuIKig0M1HD8GrpIQvbuO8DQRV7I+fYRhH/fTsj6Cla280FwdZ0s3KSKlge7zpxLD5t2a97C/EaUShPYQpO3n5utyhNAG2Kklm9Q4GDuXnRREOxmbKYS5z48n0CUI1ySOOE8xO1V8SO7fywipGHVtMZ4820aVfwbrANFpQhw24FUDT6IMwrHnvOeHotdu0XzJw4nd6e0XOyky0FEf9kJFuo4cYqpk64lJvuBhZiJLKWPRntimd9TpnmzpgDCwCD/zF9a0frEeD2gDIlmd49rvzWuW9gvhi5aXj9F1zvE02+QgYHVEKnSia0vg== 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=DEwpX+7sGmCUz69sa0zpmoWRNjjPFz9I/VStWWNqmmU=; b=mNtKgIBOheRNVtXUEFc4BJKS9x23LIVknA/DQjngo2r0t7h4ZhCq4Xn4vuThtei1CAk4xouH/+LJ++DpMT0wvG+WysppYL1dnTCWXZ4iBHGgD6y7OGrpPSuJMcSThpfBi9GmTkXuJ742nSD+C6bbpAF+AboQthPloHw3Ccg8Um/2x8IY3FuyCOU3iKr0dhMyam/Y3IHZ5EzRaVOl8Va8Vm+ubgq9Nbc2T7EeepkobTe2SHvnm033cfBbPy12+HtNk6J8oaNJgYaWCpGWPo8XdRtkBpUL5fENNLjFYmonyiTgCWXnYouZ2+5PnyJuL9JX9f9CTJvtqrO9AA5Q9nRQbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DEwpX+7sGmCUz69sa0zpmoWRNjjPFz9I/VStWWNqmmU=; b=K8m9iIfry7oJ9bcxYrCsZQLoSlTEYyUX5IW/O+jo6jESinCb9EKbfzr4oe1oyYlvvYf+3VoWmFrgxmayIMr9YuGnRqPubreH007SNLUqbNMyXI7Eqt4vGnuawTy/0n+VZQ8+eRO3eAC0Ae2rutnBxY+4yI24gTkIRLH+HMgzqdKpkunKHDZkOVjZLihjqktmbbar50j2vcSHiio6svSHL+3TwEDQILYIF0tfKMxWE6v4vKGWMacwxjKAQL3TaUVkf24/2JiYS9xKEuleAD0jvqPFGhg9XtCI6STnFVqtHXvN6e/TqNdL4g5AkX6FlToIYC2y/v+fZ32i2xgF5u+whQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS4PR04MB9244.eurprd04.prod.outlook.com (2603:10a6:20b:4e3::9) by DU0PR04MB9441.eurprd04.prod.outlook.com (2603:10a6:10:359::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.21; Mon, 28 Oct 2024 19:06:52 +0000 Received: from AS4PR04MB9244.eurprd04.prod.outlook.com ([fe80::7303:2cc8:d109:d7c1]) by AS4PR04MB9244.eurprd04.prod.outlook.com ([fe80::7303:2cc8:d109:d7c1%4]) with mapi id 15.20.8093.018; Mon, 28 Oct 2024 19:06:51 +0000 From: Mirela Rabulea To: mchehab@kernel.org, sakari.ailus@linux.intel.com, hverkuil-cisco@xs4all.nl, laurent.pinchart+renesas@ideasonboard.com, laurentiu.palcu@nxp.com, robert.chiras@nxp.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, LnxRevLi@nxp.com, kieran.bingham@ideasonboard.com, hdegoede@redhat.com, dave.stevenson@raspberrypi.com, mike.rudenko@gmail.com, alain.volmat@foss.st.com, julien.vuillaumier@nxp.com, alice.yuan@nxp.com Subject: [PATCH 5/5] media: ox05b1s: Add support for Omnivision OS08A20 raw sensor Date: Mon, 28 Oct 2024 21:06:28 +0200 Message-Id: <20241028190628.257249-6-mirela.rabulea@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241028190628.257249-1-mirela.rabulea@nxp.com> References: <20241028190628.257249-1-mirela.rabulea@nxp.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: VI1PR07CA0289.eurprd07.prod.outlook.com (2603:10a6:800:130::17) To AS4PR04MB9244.eurprd04.prod.outlook.com (2603:10a6:20b:4e3::9) 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: AS4PR04MB9244:EE_|DU0PR04MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e082d1b-546c-41ed-945f-08dcf783adf3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|7416014|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UEh4GqFZEaI3+LgDeVUpaHnVJbKFlETDZn0aA0ilx4BM7O6/shoZPMoF8+WW?= =?us-ascii?Q?McMUHJgCchES2UznnhJysIf23T+PSW2BbqPQqiLpJ4vhVHytEO0CKN+1GGsU?= =?us-ascii?Q?8icZ2xm20HoREiD2PhKtQczSH9jLcX9F9d1qfRPkNuVUt42bfL94k7UTJfsB?= =?us-ascii?Q?zNTO6S3B75UaOkAlX2DeNWozTXFsasss0G7pBvc/YrZH87nXdLdVsUKMoNnH?= =?us-ascii?Q?RRkDebhtaz+B0VyrXRRvw3cHEj7IG44K9eBEBFpTPMmgycW4QT8CaLgtyJUu?= =?us-ascii?Q?tkUStwJOj0aFFNbMYv7HamBBxAF+3vGe+PspB1zJLUvm+xSeUvIdQcqezS4K?= =?us-ascii?Q?JrYy3+mxcAB6+5699x2IKqhyyqBf9/9GUGLHMYT6vzVJ6vADqFtkMIXAmI7x?= =?us-ascii?Q?b28uEy3qIbRK7msXsxgFti+yWlYtTODrzHL89RAQNIVvUEG20x6A8JB1571A?= =?us-ascii?Q?vlpN9QzKSz/mgSViEyMplsw5iq2POohmJZtsE6ILS/pkxMU+vSHfAHZEwcBe?= =?us-ascii?Q?GqBHL9rcFwhCaUeAHH1onPPnT+AwZEYC8AQzn/X1ld858TzDPZRGaY26ALdo?= =?us-ascii?Q?ZfGp5Fdcac889gUCl4w0lz+SHjdIhNX+LLKVQbI1YFvX/98FMAb6uPasDmL3?= =?us-ascii?Q?v9noE7E8UpQW60FMeLZhIr4dk8JnMG2uku3SU7iNJDOGUMyQj0L6Ty5j1tL3?= =?us-ascii?Q?YvJI/hlbBMcLE81dBO0tV46bLjMcaT4WlSHO8aqiiEOaFVMfPaP0e2hhNMZs?= =?us-ascii?Q?I1KtpT391h9NyFOQAHFLijS4GBDMPuSAqgA9fwVmZAwPisyD7Ob8tv3z+znF?= =?us-ascii?Q?1E5kUwbWKut5+JZQPqMVst2TKSAmTFBmiutaNtlR8n36CI8vnL0CCuQithDn?= =?us-ascii?Q?OQv9PaI+WNeNb4brtJ7gVfaNh8vEnS7vi9l0yqy4rZOisqEP1FeiunGdQHPJ?= =?us-ascii?Q?rxGt5+K1ddg++mypDp1mpZV6REa6yajtywysOEHn7hxHCfXEfeM5qfyCmQsK?= =?us-ascii?Q?uHMenzXQco5/2j9udAxHrqMp1af33gZt61gVwmJCfrkgta77TRUIsgY57VdB?= =?us-ascii?Q?YHgyiratK3a7Pba7WM+eAy41EsOEDffT9Zo/sCscjWPtxupy/kMSnHrpCdfB?= =?us-ascii?Q?4G55HbGI7F4ivzS5SIDWzOZKzAS0lXPtemhZJkObPefeJkLLLs0e91f77fOB?= =?us-ascii?Q?6JJEZ22QAsqYp8l7XveOOqCdTidlisqPbWp+uU8HlsCdmzSleIAeeD4TDx7g?= =?us-ascii?Q?7mSWgaCtxxyqpsvgYnVd1OYgYzDFW4q6MOVJEPj1lDEoSsbsbgYCq/vm8y9d?= =?us-ascii?Q?0135WQLXcsxtCBkYBySw8lpIvetf2D0opWCg3Frg1/8jzFHA7GaliBl+39BF?= =?us-ascii?Q?vA/KREY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR04MB9244.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(7416014)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/E+ZSU813lllTt4SkOCATTiOCngRnCVzTgfZmR3tEjwRyWzWN8xSTciYEH91?= =?us-ascii?Q?nJbR+YImWiaasBibTWNqf6Ro64ES/ukQVn4wW4l1vAJKcgfFckuUcQ++L2Q6?= =?us-ascii?Q?SKubufCGBDLPtE8T0eo6GFroo8P0mIMIW4sMsH4pf1GYEEo+yKOF9q8BQWxv?= =?us-ascii?Q?u0oUgESE/VtRD6Ex6mctxacjsRYhapi1nCZQMrMDo5Bcy9I56V4yLJ1RyjGV?= =?us-ascii?Q?cRZFyB6AmWUcAVevQUZ3jjNKo/Z+QhWo0hzNOYqDKeKXZTCjRVRCInP+gdAz?= =?us-ascii?Q?BFCESED2frktAgbuLUay+FtyBm9ltS/eVKraQqN5xaNKGUwO7pWxs4Hm2BDe?= =?us-ascii?Q?S33cdLQ1xR0iTdXtMxLvBiekv/Ai5jNyzjjwVUuNpGmg4uwQwbtG+22aY8Sq?= =?us-ascii?Q?9ibDFQCPfvKwrCOSjhktQVT7KnMW6JDj0O2PqWNnCafT6R0cw0DHC5v0wznV?= =?us-ascii?Q?o3k+/mjuYyDs1RAOcifbJphah74fuPwz+SUae1BKONguy2rJk5zvLZsvwXGd?= =?us-ascii?Q?JQLT02tUROUkedfOUzf1F7o6o8G9m1zErNoiRK2jWVJxCQ+fTJRC8AdL1r8P?= =?us-ascii?Q?xb8o5RhSAnXEKgEopnIkDLY6zoWGCKJiuPp7MSN9WV/0g55nikmtycNQ7fws?= =?us-ascii?Q?gRJ01dUMj3ZcWmO9APe6uooRL2yHTe5G1ENnxE2g055MaVhnOqUnlAtAH2HI?= =?us-ascii?Q?dRXaGQ4ySzZ83T5sJSyvzmOnFayKXTTpAhxQ63wDs6hKu9GQjJCRbL5GKrOv?= =?us-ascii?Q?37eO6kLlEbfgPZnR5MtRZD5NbMYW728JFmW7kR8z2r+ZZ6O9cGFQyb7UTKpJ?= =?us-ascii?Q?4IQKlZY/fohMPDCWat4yQiM+QLaxhS7qnIdBKFICtqMrYciF8mbc0ULrzCdL?= =?us-ascii?Q?dg/qbXVq8C958zHlDDdcxhcVvA3d4Lyzzo9pWJmyB95Cwdp+FgzjPiPFGemy?= =?us-ascii?Q?NjIttt+6ra+Qm9EWgdmp6nzpgRgFHmA2War2JM1ShbE+rRj7cVnxZDrBP6ng?= =?us-ascii?Q?DFCZpaNrg6+pwIIGdxnYDuDaKRjF+q50TdgIee8sYidYdFMdDtvFlt99sd3I?= =?us-ascii?Q?MoBsr6OxSWy+ZI+lCekknTMTO6TkvycxjdpXXS+XCAqxrWBSvP3j//rCA1dE?= =?us-ascii?Q?qvonsyFiX+htJ+t7jwnKEvp2Fd2L78aFfYLpjVI3BjLYY4XZcRYSenauc3cx?= =?us-ascii?Q?PXvY2/ctvmDEbVdRuBha+AD6Fn3uyKL7/HRW6jaif8vEf2ORLLViyBM6qwr4?= =?us-ascii?Q?XR+s+B9aqdd3SmTc1os/So7rqIgLIlHFQ6gMlR6c5evsi9+o6UDgCijdROhE?= =?us-ascii?Q?4fgSfIEZFXMg/BNegyDJdLZnEnh7U02Q0mLlZ26MOtTImOnlj6Uq3+xeDGkF?= =?us-ascii?Q?INDh30daUwOOJHdl00ZOVBiQ7NGlOZUMzs7zZP2l5RohzEnfuDKFLxRrG6ZE?= =?us-ascii?Q?Si6fCx4aYZF0JM7Zo9ZQfU8YXckPhMZCI63I4xcK55Ct3X/QQT6sWkjRdGWR?= =?us-ascii?Q?eh0Lw1nkYBFXX2rXD4AatvW6/B8QIFInf827gvv+zApbp6qvw6VbKSnDdzah?= =?us-ascii?Q?K7RaXn6LqxrAyWzkCCdByBY8DKe20zt1EziUz81/BZIdrUQ37/lAWP9f4Y3n?= =?us-ascii?Q?Lg=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e082d1b-546c-41ed-945f-08dcf783adf3 X-MS-Exchange-CrossTenant-AuthSource: AS4PR04MB9244.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 19:06:51.8538 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lMLzt3agxU1oAbCgyOPhDUpToWWP/BlWFE+yUvRBe3WXxRGkW/DVIivLb5le+E/FkQYa1ycAgNddg5pdKQypVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9441 Content-Type: text/plain; charset="utf-8" This is an 8 megapixel raw10/raw12 sensor with HDR capabilities. HDR mode control is supported, with one hdr mode: staggered HDR with 2 exposures on separate virtual channels. Supported resolutions: - 1920 x 1080 @ 60fps (SBGGR10, no HDR) - 1920 x 1080 @ 30fps (SBGGR10, HDR) - 3840 x 2160 @ 30fps (SBGGR12, no HDR) - 3840 x 2160 @ 15fps (SBGGR10, HDR) - 3840 x 2160 @ 15fps (SBGGR12, HDR) - 3840 x 2160 @ 30fps (SBGGR12, no HDR) - 3840 x 2160 @ 30fps (SBGGR10, no HDR) Signed-off-by: Mirela Rabulea --- .../media/i2c/ox05b1s/os08a20_regs_1080p.h | 201 +++++++++++++++++ drivers/media/i2c/ox05b1s/os08a20_regs_4k.h | 209 ++++++++++++++++++ .../media/i2c/ox05b1s/os08a20_regs_4k_hdr.h | 199 +++++++++++++++++ drivers/media/i2c/ox05b1s/ox05b1s_mipi.c | 189 ++++++++++++++++ 4 files changed, 798 insertions(+) create mode 100644 drivers/media/i2c/ox05b1s/os08a20_regs_1080p.h create mode 100644 drivers/media/i2c/ox05b1s/os08a20_regs_4k.h create mode 100644 drivers/media/i2c/ox05b1s/os08a20_regs_4k_hdr.h diff --git a/drivers/media/i2c/ox05b1s/os08a20_regs_1080p.h b/drivers/media= /i2c/ox05b1s/os08a20_regs_1080p.h new file mode 100644 index 000000000000..ab9977c56a10 --- /dev/null +++ b/drivers/media/i2c/ox05b1s/os08a20_regs_1080p.h @@ -0,0 +1,201 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * A register configuration for Omnivision OS08A20 raw camera, 1920 x 1080= @60fps BGGR10 + * Copyright (C) 2024, NXP + * Copyright (C) 2024, Omnivision + * Copyright (C) 2024, Verisilicon + * + */ +#ifndef _OS08A20_REGS_1080P_H_ +#define _OS08A20_REGS_1080P_H_ + +static struct ox05b1s_reg os08a20_init_setting_1080p[] =3D { + {0x0100, 0x00}, + {0x0103, 0x01}, + {0x0303, 0x01}, + {0x0304, 0x00}, /* PLL_CTRL_04 (default 0x00) */ + {0x0305, 0x2d}, /* PLL_CTRL_05 (default 0x3c) */ + {0x0306, 0x00}, + {0x0308, 0x03}, + {0x0309, 0x04}, + {0x0325, 0x45}, /* PLL_CTRL_25 (default 0x3c) */ + {0x0327, 0x05}, /* PLL_CTRL_27 (default 0x07) */ + {0x0328, 0x02}, /* PLL_CTRL_28 (default 0x07) */ + {0x032a, 0x02}, /* PLL_CTRL_2a (default 0x00) */ + {0x300f, 0x11}, + {0x3010, 0x01}, + {0x3011, 0x04}, + {0x3012, 0x41}, + {0x3016, 0xf0}, + {0x301e, 0x98}, + {0x3031, 0xa9}, + {0x3103, 0x92}, + {0x3104, 0x01}, + {0x3106, 0x10}, + {0x3400, 0x04}, /* PSV CTRL (default 0x00) bit[2]=3Dr_psv_mode_en */ + {0x3025, 0x03}, /* PSV MODE OPT (default 0x02) not used */ + {0x3425, 0x01}, /* R ASP PD SEL bit[1:0]=3Dstream blanking */ + {0x3428, 0x01}, /* R ASP PD SEL bit[1:0]=3Dbpg1 N-pump1 bypass to AGND */ + {0x3408, 0x03}, /* CTRL08 (default 0x01) bit[3:0]=3Dr_clk_winp_off */ + {0x340c, 0xff}, + {0x340d, 0xff}, + {0x031e, 0x09}, + {0x3501, 0x04}, /* Long exposure */ + {0x3502, 0x62}, /* Long exposure */ + {0x3505, 0x83}, + {0x3508, 0x00}, /* Long gain */ + {0x3509, 0x80}, /* Long gain */ + {0x350a, 0x04}, + {0x350b, 0x00}, + {0x350c, 0x00}, + {0x350d, 0x80}, + {0x350e, 0x04}, + {0x350f, 0x00}, + {0x3600, 0x09}, /* CORE0 bit[0]=3Dstg_hdr_align_en, bit[3]=3Dnew_stgr_hdr= _en */ + {0x3603, 0x2c}, + {0x3605, 0x50}, + {0x3609, 0xb5}, + {0x3610, 0x39}, + {0x360c, 0x01}, + {0x3628, 0xa4}, + {0x362d, 0x10}, + {0x3660, 0x43}, /* CORE0 bit[0]=3Drip_sof_vifo_en, bit[1]=3Dstg_hdr_long_= en debug mode */ + {0x3662, 0x00}, + {0x3663, 0x28}, + {0x3664, 0x0d}, + {0x366a, 0x38}, + {0x366b, 0xa0}, + {0x366d, 0x00}, + {0x366e, 0x00}, + {0x3680, 0x00}, + {0x36c0, 0x00}, + {0x3701, 0x02}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x373b, 0x02}, + {0x373c, 0x02}, + {0x3736, 0x02}, + {0x3737, 0x02}, + {0x3705, 0x00}, + {0x3706, 0x39}, + {0x370a, 0x00}, + {0x370b, 0x98}, + {0x3709, 0x49}, + {0x3714, 0x22}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x371c, 0x00}, + {0x371d, 0x08}, + {0x3740, 0x1b}, + {0x3741, 0x04}, + {0x375e, 0x0b}, + {0x3760, 0x10}, + {0x3776, 0x10}, + {0x3781, 0x02}, + {0x3782, 0x04}, + {0x3783, 0x02}, + {0x3784, 0x08}, + {0x3785, 0x08}, + {0x3788, 0x01}, + {0x3789, 0x01}, + {0x3797, 0x04}, + {0x3762, 0x11}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x3800, 0x00}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x0c}, + {0x3804, 0x0e}, + {0x3805, 0xff}, + {0x3806, 0x08}, + {0x3807, 0x6f}, + {0x3808, 0x07}, /* X output size (default 0x07) */ + {0x3809, 0x80}, /* X output size (default 0x80) */ + {0x380a, 0x04}, /* Y output size (default 0x04) */ + {0x380b, 0x38}, /* Y output size (default 0x38) */ + {0x380c, 0x07}, /* HTS[15:8], total horizontal timing size */ + {0x380d, 0x90}, /* HTS[7:0], total horizontal timing size */ + {0x380e, 0x04}, /* VTS[15:8], total vertical timing (default 0x04) */ + {0x380f, 0xa4}, /* VTS[7:0], total vertical timing (default 0xA0) */ + {0x3813, 0x08}, /* ISP_Y_WIN ISP vertical windowing offset */ + {0x3814, 0x03}, /* X INC ODD (default 0x01) */ + {0x3815, 0x01}, /* X INC EVEN (default 0x01) */ + {0x3816, 0x03}, /* Y INC ODD (default 0x01) */ + {0x3817, 0x01}, /* Y INC EVEN (default 0x01) */ + {0x381c, 0x00}, /* BLC_NUM_OPTION (default 0x0e) */ + {0x3820, 0x01}, /* FORMAT1 (default 0x80) bit[0]=3Dvertical bining */ + {0x3821, 0x05}, /* FORMAT2 bit[2]=3Dmirror, bit[0]=3Dhorizontal bining */ + {0x3823, 0x08}, + {0x3826, 0x00}, + {0x3827, 0x08}, + {0x382d, 0x08}, + {0x3832, 0x02}, + {0x3833, 0x00}, /* REG33 (bit[0]=3Dr_stg_hdr_grp_wr_opt, bit[2]=3Dr_stg_g= rphold_nomask) */ + {0x383c, 0x48}, + {0x383d, 0xff}, + {0x3d85, 0x0b}, + {0x3d84, 0x40}, + {0x3d8c, 0x63}, + {0x3d8d, 0xd7}, + {0x4000, 0xf8}, + {0x4001, 0x2b}, + {0x4004, 0x00}, + {0x4005, 0x40}, + {0x400a, 0x01}, + {0x400f, 0xa0}, + {0x4010, 0x12}, + {0x4018, 0x00}, + {0x4008, 0x02}, + {0x4009, 0x05}, /* BLC CTRL09 (default 0x0f) bl_end */ + {0x401a, 0x58}, + {0x4050, 0x00}, + {0x4051, 0x01}, + {0x4028, 0x2f}, + {0x4052, 0x00}, + {0x4053, 0x80}, + {0x4054, 0x00}, + {0x4055, 0x80}, + {0x4056, 0x00}, + {0x4057, 0x80}, + {0x4058, 0x00}, + {0x4059, 0x80}, + {0x430b, 0xff}, + {0x430c, 0xff}, + {0x430d, 0x00}, + {0x430e, 0x00}, + {0x4501, 0x98}, /* R1 (default 0x18) bit[4:2]=3Dnot used */ + {0x4502, 0x00}, + {0x4643, 0x00}, + {0x4640, 0x01}, + {0x4641, 0x04}, + {0x4800, 0x64}, + {0x4809, 0x2b}, + {0x4813, 0x90}, /* MIPI CTRL 13 (bit[5:4]=3DVC1=3D1, bit[7:6]=3DVC2=3D2) = */ + {0x4817, 0x04}, + {0x4833, 0x18}, + {0x4837, 0x16}, /* PCLK PERIOD (default 0x08) */ + {0x483b, 0x00}, + {0x484b, 0x03}, + {0x4850, 0x7c}, + {0x4852, 0x06}, + {0x4856, 0x58}, + {0x4857, 0xaa}, + {0x4862, 0x0a}, + {0x4869, 0x18}, + {0x486a, 0xaa}, + {0x486e, 0x03}, /* MIPI CTRL 6E (default 0x03) */ + {0x486f, 0x55}, + {0x4875, 0xf0}, + {0x5000, 0x89}, + {0x5001, 0x42}, + {0x5004, 0x40}, + {0x5005, 0x00}, + {0x5180, 0x00}, + {0x5181, 0x10}, + {0x580b, 0x03}, + {0x4d00, 0x03}, + {0x4d01, 0xc9}, + {0x4d02, 0xbc}, + {0x4d03, 0xc6}, + {0x4d04, 0x4a}, + {0x4d05, 0x25}, + {0x4700, 0x2b}, + {0x4e00, 0x2b}, +}; + +#endif diff --git a/drivers/media/i2c/ox05b1s/os08a20_regs_4k.h b/drivers/media/i2= c/ox05b1s/os08a20_regs_4k.h new file mode 100644 index 000000000000..f3d5f0fe1b61 --- /dev/null +++ b/drivers/media/i2c/ox05b1s/os08a20_regs_4k.h @@ -0,0 +1,209 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * A register configuration for Omnivision OS08A20 raw camera, 3840 x 2160= @30fps BGGR12 + * Copyright (C) 2024, NXP + * Copyright (C) 2024, Omnivision + * Copyright (C) 2024, Verisilicon + * + */ + +#ifndef _OS08A20_REGS_4K_H_ +#define _OS08A20_REGS_4K_H_ + +static struct ox05b1s_reg os08a20_init_setting_4k[] =3D { + {0x0100, 0x00}, + {0x0103, 0x01}, + {0x0303, 0x01}, + {0x0305, 0x3c}, /* PLL_CTRL_05 (default 0x3c) */ + {0x0306, 0x00}, + {0x0308, 0x03}, + {0x0309, 0x04}, + {0x0325, 0x47}, /* PLL_CTRL_25 (default 0x3c) */ + {0x032a, 0x00}, /* PLL_CTRL_2a (default 0x00) */ + {0x300f, 0x11}, + {0x3010, 0x01}, + {0x3011, 0x04}, + {0x3012, 0x41}, + {0x3016, 0xf0}, + {0x301e, 0x98}, + {0x3031, 0xa9}, + {0x3103, 0x92}, + {0x3104, 0x01}, + {0x3106, 0x10}, + {0x3400, 0x04}, /* PSV CTRL (default 0x00) bit[2]=3Dr_psv_mode_en */ + {0x3025, 0x03}, /* PSV MODE OPT (default 0x02) not used */ + {0x3425, 0x01}, /* R ASP PD SEL bit[1:0]=3Dstream blanking */ + {0x3428, 0x01}, /* R ASP PD SEL bit[1:0]=3Dbpg1 N-pump1 bypass to AGND */ + {0x3408, 0x03}, /* CTRL08 (default 0x01) bit[3:0]=3Dr_clk_winp_off */ + {0x340c, 0xff}, + {0x340d, 0xff}, + {0x031e, 0x0a}, + {0x3501, 0x08}, /* Long exposure */ + {0x3502, 0xe5}, /* Long exposure */ + {0x3505, 0x83}, + {0x3508, 0x00}, /* Long gain */ + {0x3509, 0x80}, /* Long gain */ + {0x350a, 0x04}, + {0x350b, 0x00}, + {0x350c, 0x00}, + {0x350d, 0x80}, + {0x350e, 0x04}, + {0x350f, 0x00}, + {0x3600, 0x00}, /* CORE0 bit[0]=3Dstg_hdr_align_en, bit[3]=3Dnew_stgr_hdr= _en */ + {0x3603, 0x2c}, + {0x3605, 0x50}, + {0x3609, 0xdb}, + {0x3610, 0x39}, + {0x360c, 0x01}, + {0x3628, 0xa4}, + {0x362d, 0x10}, + {0x3660, 0xd3}, /* CORE0 bit[0]=3Drip_sof_vifo_en, bit[1]=3Dstg_hdr_long_= en debug mode */ + {0x3662, 0x00}, + {0x3663, 0x28}, + {0x3664, 0x0d}, + {0x366a, 0x38}, + {0x366b, 0xa0}, + {0x366d, 0x00}, + {0x366e, 0x00}, + {0x3680, 0x00}, + {0x36c0, 0x00}, + {0x3701, 0x02}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x373b, 0x02}, + {0x373c, 0x02}, + {0x3736, 0x02}, + {0x3737, 0x02}, + {0x3705, 0x00}, + {0x3706, 0x72}, + {0x370a, 0x01}, + {0x370b, 0x30}, + {0x3709, 0x48}, + {0x3714, 0x21}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x371c, 0x00}, + {0x371d, 0x08}, + {0x3740, 0x1b}, + {0x3741, 0x04}, + {0x375e, 0x0b}, + {0x3760, 0x10}, + {0x3776, 0x10}, + {0x3781, 0x02}, + {0x3782, 0x04}, + {0x3783, 0x02}, + {0x3784, 0x08}, + {0x3785, 0x08}, + {0x3788, 0x01}, + {0x3789, 0x01}, + {0x3797, 0x04}, + {0x3762, 0x11}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x3800, 0x00}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x0c}, + {0x3804, 0x0e}, + {0x3805, 0xff}, + {0x3806, 0x08}, + {0x3807, 0x6f}, + {0x3808, 0x0f}, /* X output size (default 0x07) */ + {0x3809, 0x00}, /* X output size (default 0x80) */ + {0x380a, 0x08}, /* Y output size (default 0x04) */ + {0x380b, 0x70}, /* Y output size (default 0x38) */ + {0x380c, 0x08}, /* HTS[15:8], total horizontal timing size */ + {0x380d, 0x14}, /* HTS[7:0], total horizontal timing size */ + {0x380e, 0x08}, /* VTS[15:8], total vertical timing (default 0x04) */ + {0x380f, 0xf0}, /* VTS[7:0], total vertical timing (default 0xA0) */ + {0x3813, 0x10}, /* ISP_Y_WIN ISP vertical windowing offset */ + {0x3814, 0x01}, /* X INC ODD (default 0x01) */ + {0x3815, 0x01}, /* X INC EVEN (default 0x01) */ + {0x3816, 0x01}, /* Y INC ODD (default 0x01) */ + {0x3817, 0x01}, /* Y INC EVEN (default 0x01) */ + {0x381c, 0x00}, /* BLC_NUM_OPTION (default 0x0e) */ + {0x3820, 0x00}, /* FORMAT1 (default 0x80) bit[0]=3Dvertical bining */ + {0x3821, 0x04}, /* FORMAT2 bit[2]=3Dmirror, bit[0]=3Dhorizontal bining */ + {0x3823, 0x08}, + {0x3826, 0x00}, + {0x3827, 0x08}, + {0x382d, 0x08}, + {0x3832, 0x02}, + {0x3833, 0x00}, /* REG33 (bit[0]=3Dr_stg_hdr_grp_wr_opt, bit[2]=3Dr_stg_g= rphold_nomask) */ + {0x383c, 0x48}, + {0x383d, 0xff}, + {0x3d85, 0x0b}, + {0x3d84, 0x40}, + {0x3d8c, 0x63}, + {0x3d8d, 0xd7}, + {0x4000, 0xf8}, + {0x4001, 0x2b}, + {0x4004, 0x00}, + {0x4005, 0x40}, + {0x400a, 0x01}, + {0x400f, 0xa0}, + {0x4010, 0x12}, + {0x4018, 0x00}, + {0x4008, 0x02}, + {0x4009, 0x0d}, /* BLC CTRL09 (default 0x0f) bl_end */ + {0x401a, 0x58}, + {0x4050, 0x00}, + {0x4051, 0x01}, + {0x4028, 0x2f}, + {0x4052, 0x00}, + {0x4053, 0x80}, + {0x4054, 0x00}, + {0x4055, 0x80}, + {0x4056, 0x00}, + {0x4057, 0x80}, + {0x4058, 0x00}, + {0x4059, 0x80}, + {0x430b, 0xff}, + {0x430c, 0xff}, + {0x430d, 0x00}, + {0x430e, 0x00}, + {0x4501, 0x18}, /* R1 (default 0x18) bit[4:2]=3Dnot used */ + {0x4502, 0x00}, + {0x4600, 0x00}, + {0x4601, 0x20}, + {0x4603, 0x01}, + {0x4643, 0x00}, + {0x4640, 0x01}, + {0x4641, 0x04}, + {0x4800, 0x64}, + {0x4809, 0x2b}, + {0x4813, 0x90}, /* MIPI CTRL 13 (bit[5:4]=3DVC1=3D1, bit[7:6]=3DVC2=3D2) = */ + {0x4817, 0x04}, + {0x4833, 0x18}, + {0x4837, 0x10}, /* PCLK PERIOD (default 0x08) */ + {0x483b, 0x00}, + {0x484b, 0x03}, + {0x4850, 0x7c}, + {0x4852, 0x06}, + {0x4856, 0x58}, + {0x4857, 0xaa}, + {0x4862, 0x0a}, + {0x4869, 0x18}, + {0x486a, 0xaa}, + {0x486e, 0x03}, /* MIPI CTRL 6E (default 0x03) */ + {0x486f, 0x55}, + {0x4875, 0xf0}, + {0x5000, 0x89}, + {0x5001, 0x42}, + {0x5004, 0x40}, + {0x5005, 0x00}, + {0x5180, 0x00}, + {0x5181, 0x10}, + {0x580b, 0x03}, + {0x4d00, 0x03}, + {0x4d01, 0xc9}, + {0x4d02, 0xbc}, + {0x4d03, 0xc6}, + {0x4d04, 0x4a}, + {0x4d05, 0x25}, + {0x4700, 0x2b}, + {0x4e00, 0x2b}, + {0x3501, 0x09}, /* Long exposure */ + {0x3502, 0x01}, /* Long exposure */ + {0x4028, 0x4f}, + {0x4029, 0x1f}, + {0x402a, 0x7f}, + {0x402b, 0x01}, + {0x0100, 0x01}, +}; + +#endif diff --git a/drivers/media/i2c/ox05b1s/os08a20_regs_4k_hdr.h b/drivers/medi= a/i2c/ox05b1s/os08a20_regs_4k_hdr.h new file mode 100644 index 000000000000..2ae79ebae436 --- /dev/null +++ b/drivers/media/i2c/ox05b1s/os08a20_regs_4k_hdr.h @@ -0,0 +1,199 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * A register configuration for Omnivision OS08A20 raw camera, 3840 x 2160= @30fps BGGR10 HDR + * Copyright (C) 2024, NXP + * Copyright (C) 2024, Omnivision + * Copyright (C) 2024, Verisilicon + * + */ + +#ifndef _OS08A20_REGS_4K_HDR_H_ +#define _OS08A20_REGS_4K_HDR_H_ + +static struct ox05b1s_reg os08a20_init_setting_4k_hdr[] =3D { + {0x0100, 0x00}, + {0x0103, 0x01}, + {0x0303, 0x01}, + {0x0305, 0x3c}, /* PLL_CTRL_05 (default 0x3c) */ + {0x0306, 0x00}, + {0x0308, 0x03}, + {0x0309, 0x04}, + {0x032a, 0x00}, /* PLL_CTRL_2a (default 0x00) */ + {0x300f, 0x11}, + {0x3010, 0x01}, + {0x3011, 0x04}, + {0x3012, 0x41}, + {0x3016, 0xf0}, + {0x301e, 0x98}, + {0x3031, 0xa9}, + {0x3103, 0x92}, + {0x3104, 0x01}, + {0x3106, 0x10}, + {0x340c, 0xff}, + {0x340d, 0xff}, + {0x031e, 0x09}, + {0x3501, 0x08}, /* Long exposure */ + {0x3502, 0xe5}, /* Long exposure */ + {0x3505, 0x83}, + {0x3508, 0x00}, /* Long gain */ + {0x3509, 0x80}, /* Long gain */ + {0x350a, 0x04}, + {0x350b, 0x00}, + {0x350c, 0x00}, + {0x350d, 0x80}, + {0x350e, 0x04}, + {0x350f, 0x00}, + {0x3600, 0x00}, /* CORE0 bit[0]=3Dstg_hdr_align_en, bit[3]=3Dnew_stgr_hdr= _en */ + {0x3603, 0x2c}, + {0x3605, 0x50}, + {0x3609, 0xb5}, + {0x3610, 0x39}, + {0x360c, 0x01}, + {0x3628, 0xa4}, + {0x362d, 0x10}, + {0x3660, 0x42}, /* CORE0 bit[0]=3Drip_sof_vifo_en, bit[1]=3Dstg_hdr_long_= en debug mode */ + {0x3661, 0x07}, /* CORE1 (default 0x06) bit[0]=3Dstg_hdr_align_en */ + {0x3662, 0x00}, + {0x3663, 0x28}, + {0x3664, 0x0d}, + {0x366a, 0x38}, + {0x366b, 0xa0}, + {0x366d, 0x00}, + {0x366e, 0x00}, + {0x3680, 0x00}, + {0x36c0, 0x00}, + {0x3701, 0x02}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x373b, 0x02}, + {0x373c, 0x02}, + {0x3736, 0x02}, + {0x3737, 0x02}, + {0x3705, 0x00}, + {0x3706, 0x39}, + {0x370a, 0x00}, + {0x370b, 0x98}, + {0x3709, 0x49}, + {0x3714, 0x21}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x371c, 0x00}, + {0x371d, 0x08}, + {0x3740, 0x1b}, + {0x3741, 0x04}, + {0x375e, 0x0b}, + {0x3760, 0x10}, + {0x3776, 0x10}, + {0x3781, 0x02}, + {0x3782, 0x04}, + {0x3783, 0x02}, + {0x3784, 0x08}, + {0x3785, 0x08}, + {0x3788, 0x01}, + {0x3789, 0x01}, + {0x3797, 0x04}, + {0x3762, 0x11}, /* Sensor timing control registers 0x3700-0x37ff */ + {0x3800, 0x00}, + {0x3801, 0x00}, + {0x3802, 0x00}, + {0x3803, 0x0c}, + {0x3804, 0x0e}, + {0x3805, 0xff}, + {0x3806, 0x08}, + {0x3807, 0x6f}, + {0x3808, 0x0f}, /* X output size (default 0x07) */ + {0x3809, 0x00}, /* X output size (default 0x80) */ + {0x380a, 0x08}, /* Y output size (default 0x04) */ + {0x380b, 0x70}, /* Y output size (default 0x38) */ + {0x380c, 0x08}, /* HTS[15:8], total horizontal timing size */ + {0x380d, 0x18}, /* HTS[7:0], total horizontal timing size */ + {0x380e, 0x09}, /* VTS[15:8], total vertical timing (default 0x04) */ + {0x380f, 0x0a}, /* VTS[7:0], total vertical timing (default 0xA0) */ + {0x3813, 0x10}, /* ISP_Y_WIN ISP vertical windowing offset */ + {0x3814, 0x01}, /* X INC ODD (default 0x01) */ + {0x3815, 0x01}, /* X INC EVEN (default 0x01) */ + {0x3816, 0x01}, /* Y INC ODD (default 0x01) */ + {0x3817, 0x01}, /* Y INC EVEN (default 0x01) */ + {0x381c, 0x08}, /* BLC_NUM_OPTION (default 0x0e) */ + {0x3820, 0x00}, /* FORMAT1 (default 0x80) bit[0]=3Dvertical bining */ + {0x3821, 0x24}, /* FORMAT2 bit[5]=3Dstagger hdr en, bit[2]=3Dmirror */ + {0x3823, 0x08}, + {0x3826, 0x00}, + {0x3827, 0x08}, + {0x382d, 0x08}, + {0x3832, 0x02}, + {0x3833, 0x01}, /* REG33 (bit[0]=3Dr_stg_hdr_grp_wr_opt, bit[2]=3Dr_stg_g= rphold_nomask) */ + {0x383c, 0x48}, + {0x383d, 0xff}, + {0x3d85, 0x0b}, + {0x3d84, 0x40}, + {0x3d8c, 0x63}, + {0x3d8d, 0xd7}, + {0x4000, 0xf8}, + {0x4001, 0x2b}, + {0x4004, 0x00}, + {0x4005, 0x40}, + {0x400a, 0x01}, + {0x400f, 0xa0}, + {0x4010, 0x12}, + {0x4018, 0x00}, + {0x4008, 0x02}, + {0x4009, 0x0d}, /* BLC CTRL09 (default 0x0f) bl_end */ + {0x401a, 0x58}, + {0x4050, 0x00}, + {0x4051, 0x01}, + {0x4028, 0x2f}, + {0x4052, 0x00}, + {0x4053, 0x80}, + {0x4054, 0x00}, + {0x4055, 0x80}, + {0x4056, 0x00}, + {0x4057, 0x80}, + {0x4058, 0x00}, + {0x4059, 0x80}, + {0x430b, 0xff}, + {0x430c, 0xff}, + {0x430d, 0x00}, + {0x430e, 0x00}, + {0x4501, 0x18}, /* R1 (default 0x18) bit[4:2]=3Dnot used */ + {0x4502, 0x00}, + {0x4643, 0x00}, + {0x4640, 0x01}, + {0x4641, 0x04}, + {0x4800, 0x64}, + {0x4809, 0x2b}, + {0x4813, 0x98}, /* MIPI CTRL 13 (bit[5:4]=3DVC1=3D1, bit[7:6]=3DVC2=3D2) = */ + {0x4817, 0x04}, + {0x4833, 0x18}, + {0x4837, 0x10}, /* PCLK PERIOD (default 0x08) */ + {0x483b, 0x00}, + {0x484b, 0x03}, + {0x4850, 0x7c}, + {0x4852, 0x06}, + {0x4856, 0x58}, + {0x4857, 0xaa}, + {0x4862, 0x0a}, + {0x4869, 0x18}, + {0x486a, 0xaa}, + {0x486e, 0x07}, /* MIPI CTRL 6E (default 0x03) */ + {0x486f, 0x55}, + {0x4875, 0xf0}, + {0x5000, 0x89}, + {0x5001, 0x42}, + {0x5004, 0x40}, + {0x5005, 0x00}, + {0x5180, 0x00}, + {0x5181, 0x10}, + {0x580b, 0x03}, + {0x4d00, 0x03}, + {0x4d01, 0xc9}, + {0x4d02, 0xbc}, + {0x4d03, 0xc6}, + {0x4d04, 0x4a}, + {0x4d05, 0x25}, + {0x4700, 0x2b}, + {0x4e00, 0x2b}, + {0x3501, 0x08}, /* Long exposure */ + {0x3502, 0xe1}, /* Long exposure */ + {0x3511, 0x00}, /* Short exposure */ + {0x3512, 0x20}, /* Short exposure */ + {0x3833, 0x01}, +}; + +#endif diff --git a/drivers/media/i2c/ox05b1s/ox05b1s_mipi.c b/drivers/media/i2c/o= x05b1s/ox05b1s_mipi.c index 5b9c069af19b..15559265d8f0 100644 --- a/drivers/media/i2c/ox05b1s/ox05b1s_mipi.c +++ b/drivers/media/i2c/ox05b1s/ox05b1s_mipi.c @@ -42,6 +42,7 @@ struct ox05b1s_sizes { u32 sizes[OX05B1S_MAX_SIZES][2]; }; =20 +struct ox05b1s; struct ox05b1s_plat_data { char name[20]; u32 chip_id; @@ -56,6 +57,9 @@ struct ox05b1s_plat_data { u32 default_mode_index; const struct ox05b1s_sizes *supported_codes; u32 supported_codes_count; + const char * const *hdr_modes; + u32 hdr_modes_count; + int (*set_hdr_mode)(struct ox05b1s *sensor, u32 hdr_mode); }; =20 struct ox05b1s_ctrls { @@ -66,6 +70,7 @@ struct ox05b1s_ctrls { struct v4l2_ctrl *vblank; struct v4l2_ctrl *gain; struct v4l2_ctrl *exposure; + struct v4l2_ctrl *hdr_mode; }; =20 struct ox05b1s_reg { @@ -73,6 +78,9 @@ struct ox05b1s_reg { u32 data; }; =20 +#include "os08a20_regs_1080p.h" +#include "os08a20_regs_4k.h" +#include "os08a20_regs_4k_hdr.h" #include "ox05b1s_regs_5mp.h" =20 struct ox05b1s_mode { @@ -104,6 +112,68 @@ struct ox05b1s { struct ox05b1s_ctrls ctrls; }; =20 +static struct ox05b1s_mode os08a20_supported_modes[] =3D { + { + /* 1080p BGGR10, no hdr, 60fps */ + .index =3D 0, + .width =3D 1920, + .height =3D 1080, + .code =3D MEDIA_BUS_FMT_SBGGR10_1X10, + .bpp =3D 10, + .vts =3D 0x4a4, + .hts =3D 0x790, + .exp =3D 0x4a4 - 8, + .h_bin =3D true, + .fps =3D 60, + .reg_data =3D os08a20_init_setting_1080p, + .reg_data_count =3D ARRAY_SIZE(os08a20_init_setting_1080p), + }, + { + /* 4k BGGR10, staggered hdr VC0/VC1, 15fps */ + .index =3D 1, + .width =3D 3840, + .height =3D 2160, + .code =3D MEDIA_BUS_FMT_SBGGR10_1X10, + .bpp =3D 10, + .vts =3D 0x90a, + .hts =3D 0x818, + .exp =3D 0x90a - 8, + .h_bin =3D false, + .fps =3D 15, + .reg_data =3D os08a20_init_setting_4k_hdr, + .reg_data_count =3D ARRAY_SIZE(os08a20_init_setting_4k_hdr), + }, + { + /* 4k BGGR12, no hdr, 30fps */ + .index =3D 2, + .width =3D 3840, + .height =3D 2160, + .code =3D MEDIA_BUS_FMT_SBGGR12_1X12, + .bpp =3D 12, + .vts =3D 0x8f0, + .hts =3D 0x814, + .exp =3D 0x8f0 - 8, + .h_bin =3D false, + .fps =3D 30, + .reg_data =3D os08a20_init_setting_4k, + .reg_data_count =3D ARRAY_SIZE(os08a20_init_setting_4k), + }, +}; + +/* keep in sync with os08a20_supported_modes*/ +static const struct ox05b1s_sizes os08a20_supported_codes[] =3D { + { + .code =3D MEDIA_BUS_FMT_SBGGR10_1X10, + .sizes_count =3D 2, + .sizes =3D { {1920, 1080}, {3840, 2160} } + }, + { + .code =3D MEDIA_BUS_FMT_SBGGR12_1X12, + .sizes_count =3D 1, + .sizes =3D { {3840, 2160} } + }, +}; + static struct ox05b1s_mode ox05b1s_supported_modes[] =3D { { .index =3D 0, @@ -210,6 +280,18 @@ static int ox05b1s_read_reg(struct ox05b1s *sensor, u1= 6 reg, u8 *val) return ret; } =20 +static int ox05b1s_update_bits(struct ox05b1s *sensor, u16 reg, unsigned i= nt mask, u8 val) +{ + struct device *dev =3D &sensor->i2c_client->dev; + int ret =3D 0; + + ret =3D regmap_update_bits(sensor->regmap, reg, mask, val); + if (ret < 0) + dev_err(dev, "Failed to update reg addr 0x%04x with 0x%02x\n", reg, val); + + return ret; +} + #define OX05B1S_MAX_REG_BULK 16 static int ox05b1s_write_reg_array(struct ox05b1s *sensor, struct ox05b1s_reg *reg_array, @@ -239,6 +321,67 @@ static int ox05b1s_write_reg_array(struct ox05b1s *sen= sor, return 0; } =20 +static const char * const os08a20_hdr_modes[] =3D { + "NO HDR", /* No HDR, single exposure */ + "HDR Staggered", /* Staggered HDR mode, 2 exposures on separate virtual c= hannels */ +}; + +#define OS08A20_REG_CORE1 0x3661 +#define OS08A20_STG_HDR_ALIGN_EN BIT(0) + +#define OS08A20_REG_FORMAT2 0x3821 +#define OS08A20_STG_HDR_EN BIT(5) + +#define OS08A20_REG_MIPI_CTRL_13 0x4813 +#define OS08A20_MISTERY_BIT3 BIT(3) + +#define OS08A20_REG_MIPI_CTRL_6E 0x486e +#define OS08A20_MIPI_VC_ENABLE BIT(2) + +static int os08a20_enable_staggered_hdr(struct ox05b1s *sensor) +{ + int ret =3D 0; + + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_CORE1, OS08A20_STG_HDR_A= LIGN_EN, + OS08A20_STG_HDR_ALIGN_EN); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_FORMAT2, OS08A20_STG_HDR= _EN, + OS08A20_STG_HDR_EN); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_MIPI_CTRL_13, OS08A20_MI= STERY_BIT3, + OS08A20_MISTERY_BIT3); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_MIPI_CTRL_6E, OS08A20_MI= PI_VC_ENABLE, + OS08A20_MIPI_VC_ENABLE); + if (ret) + ret =3D -EIO; + + return ret; +} + +static int os08a20_disable_staggered_hdr(struct ox05b1s *sensor) +{ + int ret =3D 0; + + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_CORE1, OS08A20_STG_HDR_A= LIGN_EN, 0); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_FORMAT2, OS08A20_STG_HDR= _EN, 0); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_MIPI_CTRL_13, OS08A20_MI= STERY_BIT3, 0); + ret |=3D ox05b1s_update_bits(sensor, OS08A20_REG_MIPI_CTRL_6E, OS08A20_MI= PI_VC_ENABLE, 0); + if (ret) + ret =3D -EIO; + + return ret; +} + +static int os08a20_set_hdr_mode(struct ox05b1s *sensor, u32 hdr_mode) +{ + switch (hdr_mode) { + case 0: + return os08a20_disable_staggered_hdr(sensor); + case 1: + return os08a20_enable_staggered_hdr(sensor); + default: + return -EINVAL; + } +} + static int ox05b1s_set_hts(struct ox05b1s *sensor, u32 hts) { u8 values[2] =3D { (u8)(hts >> 8) & 0xff, (u8)(hts & 0xff) }; @@ -307,6 +450,12 @@ static int ox05b1s_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_EXPOSURE: ret =3D ox05b1s_set_exp(sensor, ctrl->val); break; + case V4L2_CID_HDR_SENSOR_MODE: + if (sensor->model->set_hdr_mode) + ret =3D sensor->model->set_hdr_mode(sensor, ctrl->val); + else + ret =3D -EINVAL; + break; default: ret =3D -EINVAL; break; @@ -369,6 +518,13 @@ static int ox05b1s_init_controls(struct ox05b1s *senso= r) ctrls->gain =3D v4l2_ctrl_new_std(hdl, ops, V4L2_CID_ANALOGUE_GAIN, 0, 0xFFFF, 1, 0x80); =20 + if (sensor->model->hdr_modes) + ctrls->hdr_mode =3D v4l2_ctrl_new_std_menu_items(hdl, ops, V4L2_CID_HDR_= SENSOR_MODE, + sensor->model->hdr_modes_count - 1, + 0, 0, sensor->model->hdr_modes); + else + ctrls->hdr_mode =3D NULL; + if (hdl->error) { ret =3D hdl->error; goto free_ctrls; @@ -670,7 +826,10 @@ static u8 ox05b1s_code2dt(const u32 code) { switch (code) { case MEDIA_BUS_FMT_SGRBG10_1X10: + case MEDIA_BUS_FMT_SBGGR10_1X10: return MIPI_CSI2_DT_RAW10; + case MEDIA_BUS_FMT_SBGGR12_1X12: + return MIPI_CSI2_DT_RAW12; default: return MIPI_CSI2_DT_RAW10; } @@ -775,6 +934,9 @@ static int ox05b1s_read_chip_id(struct ox05b1s *sensor) } =20 switch (chip_id) { + case 0x530841: + camera_name =3D "os08a20"; + break; case 0x580542: camera_name =3D "ox05b1s"; break; @@ -915,6 +1077,26 @@ static void ox05b1s_remove(struct i2c_client *client) static DEFINE_RUNTIME_DEV_PM_OPS(ox05b1s_pm_ops, ox05b1s_runtime_suspend, ox05b1s_runtime_resume, NULL); =20 +static const struct ox05b1s_plat_data os08a20_data =3D { + .name =3D "os08a20", + .chip_id =3D 0x530841, + .native_width =3D 3872, /* 16 dummy + 3840 active pixels + 16 dummy */ + .native_height =3D 2192, /* 16 dummy + 2160 active lines + 16 dummy */ + .active_top =3D 16, + .active_left =3D 16, + .active_width =3D 3840, + .active_height =3D 2160, + .supported_modes =3D os08a20_supported_modes, + .supported_modes_count =3D ARRAY_SIZE(os08a20_supported_modes), + .default_mode_index =3D 0, + .supported_codes =3D os08a20_supported_codes, + .supported_codes_count =3D ARRAY_SIZE(os08a20_supported_codes), + .hdr_modes =3D os08a20_hdr_modes, + .hdr_modes_count =3D ARRAY_SIZE(os08a20_hdr_modes), + .set_hdr_mode =3D os08a20_set_hdr_mode, + +}; + static const struct ox05b1s_plat_data ox05b1s_data =3D { .name =3D "ox05b1s", .chip_id =3D 0x580542, @@ -929,9 +1111,16 @@ static const struct ox05b1s_plat_data ox05b1s_data = =3D { .default_mode_index =3D 0, .supported_codes =3D ox05b1s_supported_codes, .supported_codes_count =3D ARRAY_SIZE(ox05b1s_supported_codes), + .hdr_modes =3D NULL, + .hdr_modes_count =3D 0, + .set_hdr_mode =3D NULL, }; =20 static const struct of_device_id ox05b1s_of_match[] =3D { + { + .compatible =3D "ovti,os08a20", + .data =3D &os08a20_data, + }, { .compatible =3D "ovti,ox05b1s", .data =3D &ox05b1s_data, --=20 2.25.1