From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD516CD11C2 for ; Fri, 5 Apr 2024 10:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hDWAm/twLoxT4XPsACHQyDLF7EF0MvlUAc6GjQ7SMWo=; b=AsbYdyIqpgBujJ /b68uWMQtZArVMXi/7dZ6M79tWLHukUkmFX2AqcCegf4bE/uH9o+JW6nbYaMNSs17NkxWSPClI46I OgWqsLvd2/dIcNWCcNkDIT3/RnHRvYHvfdHozv9rKRAVr7RnOWEAiS20aKFcmuzoAXBnLPBojpi41 1Sba/qZiI6We/oddIPdRGtPu+/NBwnNJ3zFkm0NsTdnGjRjerN5CzIFtAKegam3vbC6T/k1bNyndY 7SiBk9Oz8fGhQrxZB7b1CqA+pMZc4YMDiw1Zngo931aekenANt4Kn4z/ojXdrZLzLYssqt6Kbsc7d BjuXFr8cvjxsPjZHPrpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rshIR-00000006Ydl-1eHS; Fri, 05 Apr 2024 10:59:47 +0000 Received: from mgamail.intel.com ([198.175.65.15]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rshIO-00000006Ycc-30ek for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 10:59:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712314784; x=1743850784; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=D8Y8kSPgdNQltZQgMyJDuKh4/mxZzHlrbAO8HfxrMCg=; b=H4pDmcvwfyfgz3vwAX/uipgL+s3JCadxSO9V4+hqAy6xYpa7YxKOp9rA SsFOtpVhJTiDhaEehM2SFlnATBwbTnJEYlMl+BuFkaVovVVKOJ/f4xIdm lqcbCO7ro/MFX7CPuIwEoAiFeAtwhv87MvQNOcKS4FljIYrcHRZKlqjC3 wHQUEtLI3rvqE+9Mx6WpJVsC/VhBJSfwkQvLkw2zIlfb28LlllTSb3aPv 30u+nVkaERQ/wkP3ktArNShPpqazTyRsAxEOrFeVgVWN/LJg1jg/Euwkm CSgJa72VZFdsCsL+35cJqAcO2F/Jw9ulQw+C/gIDLAXgz7dU70QhCecqQ A==; X-CSE-ConnectionGUID: tI+LGHlsRKCAqwXPYP5XCQ== X-CSE-MsgGUID: sl9yrXCFTx2NA8GB8oiiYg== X-IronPort-AV: E=McAfee;i="6600,9927,11034"; a="11431798" X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="11431798" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2024 03:59:42 -0700 X-CSE-ConnectionGUID: IuMHpOWjTvq08bwRRgjn6A== X-CSE-MsgGUID: 6/LVX0bqSlWd8NIDS/R2qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="19579543" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2024 03:59:38 -0700 Received: from kekkonen.localdomain (localhost [127.0.0.1]) by kekkonen.fi.intel.com (Postfix) with SMTP id 68C1311F8B1; Fri, 5 Apr 2024 13:59:35 +0300 (EEST) Date: Fri, 5 Apr 2024 10:59:35 +0000 From: Sakari Ailus To: Luigi311 Cc: linux-media@vger.kernel.org, dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pavel@ucw.cz, phone-devel@vger.kernel.org Subject: Re: [PATCH v3 19/25] media: i2c: imx258: Change register settings for variants of the sensor Message-ID: References: <20240403150355.189229-1-git@luigi311.com> <20240403150355.189229-20-git@luigi311.com> <998efafa-699b-4226-91d4-2ebba85d63ec@luigi311.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <998efafa-699b-4226-91d4-2ebba85d63ec@luigi311.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_035944_842590_EE159619 X-CRM114-Status: GOOD ( 31.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Luis, Dave, On Thu, Apr 04, 2024 at 04:44:05PM -0600, Luigi311 wrote: > On 4/3/24 10:18, Sakari Ailus wrote: > > Hi Luis, Dave, > > > > On Wed, Apr 03, 2024 at 09:03:48AM -0600, git@luigi311.com wrote: > >> From: Dave Stevenson > >> > >> Sony have advised that there are variants of the IMX258 sensor which > >> require slightly different register configuration to the mainline > >> imx258 driver defaults. > >> > >> There is no available run-time detection for the variant, so add > >> configuration via the DT compatible string. > >> > >> The Vision Components imx258 module supports PDAF, so add the > >> register differences for that variant > >> > >> Signed-off-by: Dave Stevenson > >> Signed-off-by: Luis Garcia > >> --- > >> drivers/media/i2c/imx258.c | 48 ++++++++++++++++++++++++++++++++++---- > >> 1 file changed, 44 insertions(+), 4 deletions(-) > >> > >> diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c > >> index 775d957c9b87..fa48da212037 100644 > >> --- a/drivers/media/i2c/imx258.c > >> +++ b/drivers/media/i2c/imx258.c > >> @@ -6,6 +6,7 @@ > >> #include > >> #include > >> #include > >> +#include > >> #include > >> #include > >> #include > >> @@ -321,8 +322,6 @@ static const struct imx258_reg mipi_642mbps_24mhz_4l[] = { > >> > >> static const struct imx258_reg mode_common_regs[] = { > >> { 0x3051, 0x00 }, > >> - { 0x3052, 0x00 }, > >> - { 0x4E21, 0x14 }, > >> { 0x6B11, 0xCF }, > >> { 0x7FF0, 0x08 }, > >> { 0x7FF1, 0x0F }, > >> @@ -345,7 +344,6 @@ static const struct imx258_reg mode_common_regs[] = { > >> { 0x7FA8, 0x03 }, > >> { 0x7FA9, 0xFE }, > >> { 0x7B24, 0x81 }, > >> - { 0x7B25, 0x00 }, > >> { 0x6564, 0x07 }, > >> { 0x6B0D, 0x41 }, > >> { 0x653D, 0x04 }, > >> @@ -460,6 +458,33 @@ static const struct imx258_reg mode_1048_780_regs[] = { > >> { 0x034F, 0x0C }, > >> }; > >> > >> +struct imx258_variant_cfg { > >> + const struct imx258_reg *regs; > >> + unsigned int num_regs; > >> +}; > >> + > >> +static const struct imx258_reg imx258_cfg_regs[] = { > >> + { 0x3052, 0x00 }, > >> + { 0x4E21, 0x14 }, > >> + { 0x7B25, 0x00 }, > >> +}; > >> + > >> +static const struct imx258_variant_cfg imx258_cfg = { > >> + .regs = imx258_cfg_regs, > >> + .num_regs = ARRAY_SIZE(imx258_cfg_regs), > >> +}; > >> + > >> +static const struct imx258_reg imx258_pdaf_cfg_regs[] = { > >> + { 0x3052, 0x01 }, > >> + { 0x4E21, 0x10 }, > >> + { 0x7B25, 0x01 }, > >> +}; > >> + > >> +static const struct imx258_variant_cfg imx258_pdaf_cfg = { > >> + .regs = imx258_pdaf_cfg_regs, > >> + .num_regs = ARRAY_SIZE(imx258_pdaf_cfg_regs), > >> +}; > >> + > >> static const char * const imx258_test_pattern_menu[] = { > >> "Disabled", > >> "Solid Colour", > >> @@ -637,6 +662,8 @@ struct imx258 { > >> struct v4l2_subdev sd; > >> struct media_pad pad; > >> > >> + const struct imx258_variant_cfg *variant_cfg; > >> + > >> struct v4l2_ctrl_handler ctrl_handler; > >> /* V4L2 Controls */ > >> struct v4l2_ctrl *link_freq; > >> @@ -1104,6 +1131,14 @@ static int imx258_start_streaming(struct imx258 *imx258) > >> return ret; > >> } > >> > >> + ret = imx258_write_regs(imx258, imx258->variant_cfg->regs, > >> + imx258->variant_cfg->num_regs); > >> + if (ret) { > >> + dev_err(&client->dev, "%s failed to set variant config\n", > >> + __func__); > >> + return ret; > >> + } > >> + > >> ret = imx258_write_reg(imx258, IMX258_CLK_BLANK_STOP, > >> IMX258_REG_VALUE_08BIT, > >> imx258->csi2_flags & V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK ? > >> @@ -1492,6 +1527,10 @@ static int imx258_probe(struct i2c_client *client) > >> > >> imx258->csi2_flags = ep.bus.mipi_csi2.flags; > >> > >> + imx258->variant_cfg = of_device_get_match_data(&client->dev); > > > > You'll also need to keep this working for ACPI based systems. I.e. in > > practice remove "of_" prefix here and add the non-PDAF variant data to the > > relevant ACPI ID list. > > > > Removing of_ is easy enough and looking at all the other commits that make > this change in other drivers I dont see anything else being done besides > adding in the .data section that is down below for both imx258 and pdaf > versions. Is that what you are referencing or is there some other place > to add variant data to ACPI ID list? Speaking of which---are you absolutely certain there are two variants of this sensor? Many sensors that have a different pixel pattern (PDAF pixels or a non-Bayer pattern) can produce Bayer data when condigured so. The fact that you have differing register configuration for the PDAF and non-PDAF cases suggests this may well be the case. > > >> + if (!imx258->variant_cfg) > >> + imx258->variant_cfg = &imx258_cfg; > >> + > >> /* Initialize subdev */ > >> v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops); > >> > >> @@ -1579,7 +1618,8 @@ MODULE_DEVICE_TABLE(acpi, imx258_acpi_ids); > >> #endif > >> > >> static const struct of_device_id imx258_dt_ids[] = { > >> - { .compatible = "sony,imx258" }, > >> + { .compatible = "sony,imx258", .data = &imx258_cfg }, > >> + { .compatible = "sony,imx258-pdaf", .data = &imx258_pdaf_cfg }, > >> { /* sentinel */ } > >> }; > >> MODULE_DEVICE_TABLE(of, imx258_dt_ids); > > > -- Regards, Sakari Ailus _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel