From nobody Sun Dec 14 19:20:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C94725A321; Wed, 21 May 2025 19:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; cv=none; b=pp+2FJKEcOddwRawX7YNp72hNNhCqf/1rNxBWqoUPsnNDMi+MrJnfDBYf/rVKmbKRtHi482QDe+PTAnbFCx8TXkkoBV8zkLtmSWn1oZwhMDYFXdZY/GhMYWydTVzAgN6E5mzLJqgYZa2wF5z0+8sbzQOY9nushyX5GhfMmdvUlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; c=relaxed/simple; bh=8a8vQY24kpOTOSPqYHfBqqeVHZ2y0yNa9wTnorDnezo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OpDA8cq91zySFAwsBEblgxUYfOgC+Mmec7nK4bs1hl8W4hrwptCuehL1OiGjNETVRqqB7fI5Tixqu8UQ4hZMc2YBgfeRS2TOISXkYTtq1+oB9SD/WSWoK3hTr9hK5MNsi/d7nbTZGNXfb8uKUQrtjE+4Ub1q15lsppvtUH8dLFw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gPixCLIT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gPixCLIT" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0F7AEC4CEEA; Wed, 21 May 2025 19:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747856151; bh=8a8vQY24kpOTOSPqYHfBqqeVHZ2y0yNa9wTnorDnezo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=gPixCLITPfzRV8uPt7V2t9f6V9qhU2M2YG+Mc3CWFguXc0Bsj5xok3L0UCMq1cGo2 pckvkX7/20Y2Rp6+Puhb3XO/dEycnFDSJZ7Dal9HBGiSiTxXRUG5HeNudBYfqZ3/tI xC0P+19Hw8KHRkanrGaae7ppIcicQmWcXJXrSBWj6Kjmi1RXn3VasF0F0X2ws6JCd8 HncP052XNRzgj5hVZkv4RnxyW77O0aNh9vwb0cKbfjRD95kTiUlnVNf3XusS/lAgT0 ZgdAFy4gZKP0veZCXJ3aXtatqDDDtdDj/GHoRQehc9He44+8XifXZLO1rB5dNiYI4N pBE2JhRXoDQVA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0533C54E65; Wed, 21 May 2025 19:35:50 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Wed, 21 May 2025 21:34:24 +0200 Subject: [PATCH v3 1/5] media: i2c: imx214: Reorder imx214_parse_fwnode call Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250521-imx214_ccs_pll-v3-1-bfb4a2b53d14@apitzsch.eu> References: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> In-Reply-To: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> To: Ricardo Ribalda , Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Andr=C3=A9_Apitzsch?= , Ricardo Ribalda X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747856148; l=1201; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=JSOcAgvTpyrSY1gtujk/NN7HrGG2Tbe4hfXbnAXabfw=; b=cTQcAJeyjcHdCIB0CKYBFarIoEIQzEvH4tse6dqUe0Kr4oM9poMtr0ShJH2LQBm/nX4vg6mQZ dUqisuK/dOPApTwt5EGLeYXIPjbI1DoU/UFdNy0b08rFtHEn1K/PyiT X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Reorder imx214_parse_fwnode call to reduce goto paths in upcoming patches. No functional change intended. Acked-by: Ricardo Ribalda Signed-off-by: Andr=C3=A9 Apitzsch Reviewed-by: Laurent Pinchart --- drivers/media/i2c/imx214.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index dd7bc45523d8b5fcb3ec95728a6d32c4fddede72..0199195dcb7d12dc2ff253fe3eb= 77ddbcd0812a9 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -1261,10 +1261,6 @@ static int imx214_probe(struct i2c_client *client) struct imx214 *imx214; int ret; =20 - ret =3D imx214_parse_fwnode(dev); - if (ret) - return ret; - imx214 =3D devm_kzalloc(dev, sizeof(*imx214), GFP_KERNEL); if (!imx214) return -ENOMEM; @@ -1295,6 +1291,10 @@ static int imx214_probe(struct i2c_client *client) return dev_err_probe(dev, PTR_ERR(imx214->regmap), "failed to initialize CCI\n"); =20 + ret =3D imx214_parse_fwnode(dev); + if (ret) + return ret; + v4l2_i2c_subdev_init(&imx214->sd, client, &imx214_subdev_ops); imx214->sd.internal_ops =3D &imx214_internal_ops; =20 --=20 2.49.0 From nobody Sun Dec 14 19:20:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C9C6264A7C; Wed, 21 May 2025 19:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; cv=none; b=nN7MfWckzUu+nfjA7BJzuEt3Y6c1XGcIUkUFkIjUDDONrmu1WFDZ7xrQ3TkLZ5mYhooUQArPERo2gNFbzTLQJzq1uS8hxub/2Kx9ZYEff3i9S6TTgR9FnSr2EJK7b3phkTeQ3Y9GqkoGU6CquDg10mQTUkzwDfshr/XGdO3X74k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; c=relaxed/simple; bh=L2WGN7X2JUviaBc60J76R20EMSD9EzQJaZPVXw+rN/E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JVuYhRYke43Po6tPZd8/QFztygUQsDo3/gYlZouFtFXBZU8x08coNzIE6RroSTb5jInCXpvIUWRul8GCAHdOq1QBi0GOvRLaQXTIM8C1QsY8Caf69vCe7g8wLkDWeg+44ScLkQzVivO0y8dSbBmS46L4DvIvN7Aa8R+oR0BqiME= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MLsllN57; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MLsllN57" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1B90EC4CEED; Wed, 21 May 2025 19:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747856151; bh=L2WGN7X2JUviaBc60J76R20EMSD9EzQJaZPVXw+rN/E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=MLsllN57CyodCPgX15zGM2Jd3ZOX7Fz7e+htMd/6mQXdlX9Zf7Mk8OK4OYrOu0uyl gMPV+Wzy8MDq8YlfE9DSlWnDdsFZOcac4du8Gfa/vjr4kUoI+paZ7F+Avt/jwYnWxk WYSR3ZPhWuIBovlLsKo6jOWCczpAB38H1oMF+DqX1ioh3mO/FKM2L5n1JY4G0gtSIv uS3v/OWQ4FlboNQJaboZlMFXh2Q4LsjeNArrep6zeVfpthHEZe/s5aa/WkOel6KCSD uvoc4MgDWJwTN+K8T56pkFGY79gG90/V9nt9iWI/kYrQnf7VuveKpmUm8V2qdNioZ8 ZIt49M75SuR4g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09F02C54EDA; Wed, 21 May 2025 19:35:51 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Wed, 21 May 2025 21:34:25 +0200 Subject: [PATCH v3 2/5] media: i2c: imx214: Prepare for variable clock frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250521-imx214_ccs_pll-v3-2-bfb4a2b53d14@apitzsch.eu> References: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> In-Reply-To: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> To: Ricardo Ribalda , Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Andr=C3=A9_Apitzsch?= , Ricardo Ribalda X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747856148; l=3684; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=ddkeGCuuPcPPzIbz+qwlV4L+uKUvrwzDr+fPplJy9lU=; b=m0lrNrvqVmU0Mlud7HafGfd4RWckGidy15oW8sEPRDz+xylJVNPL3iedrBj3EJZUMtnUCuh4d FairHJgObh8BJa+vQT6lWdFpguJdiBOriNzAzltFbbDMX4oKZZg4kLF X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Move clock frequency related parameters out of the constant register sequences, such that the hard coded external clock frequency can be replaced by a variable in the upcoming patches. Acked-by: Ricardo Ribalda Signed-off-by: Andr=C3=A9 Apitzsch Reviewed-by: Laurent Pinchart --- drivers/media/i2c/imx214.c | 54 ++++++++++++++++++++++++++----------------= ---- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 0199195dcb7d12dc2ff253fe3eb77ddbcd0812a9..3aca6ebb02d649c1b7f0b6a6049= c1e3aa3d08951 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -299,16 +299,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = =3D { { IMX214_REG_DIG_CROP_WIDTH, 4096 }, { IMX214_REG_DIG_CROP_HEIGHT, 2304 }, =20 - { IMX214_REG_VTPXCK_DIV, 5 }, - { IMX214_REG_VTSYCK_DIV, 2 }, - { IMX214_REG_PREPLLCK_VT_DIV, 3 }, - { IMX214_REG_PLL_VT_MPY, 150 }, - { IMX214_REG_OPPXCK_DIV, 10 }, - { IMX214_REG_OPSYCK_DIV, 1 }, - { IMX214_REG_PLL_MULT_DRIV, IMX214_PLL_SINGLE }, - - { IMX214_REG_REQ_LINK_BIT_RATE, IMX214_LINK_BIT_RATE_MBPS(4800) }, - { CCI_REG8(0x3A03), 0x09 }, { CCI_REG8(0x3A04), 0x50 }, { CCI_REG8(0x3A05), 0x01 }, @@ -362,16 +352,6 @@ static const struct cci_reg_sequence mode_1920x1080[] = =3D { { IMX214_REG_DIG_CROP_WIDTH, 1920 }, { IMX214_REG_DIG_CROP_HEIGHT, 1080 }, =20 - { IMX214_REG_VTPXCK_DIV, 5 }, - { IMX214_REG_VTSYCK_DIV, 2 }, - { IMX214_REG_PREPLLCK_VT_DIV, 3 }, - { IMX214_REG_PLL_VT_MPY, 150 }, - { IMX214_REG_OPPXCK_DIV, 10 }, - { IMX214_REG_OPSYCK_DIV, 1 }, - { IMX214_REG_PLL_MULT_DRIV, IMX214_PLL_SINGLE }, - - { IMX214_REG_REQ_LINK_BIT_RATE, IMX214_LINK_BIT_RATE_MBPS(4800) }, - { CCI_REG8(0x3A03), 0x04 }, { CCI_REG8(0x3A04), 0xF8 }, { CCI_REG8(0x3A05), 0x02 }, @@ -405,9 +385,6 @@ static const struct cci_reg_sequence mode_table_common[= ] =3D { /* ATR setting */ { IMX214_REG_ATR_FAST_MOVE, 2 }, =20 - /* external clock setting */ - { IMX214_REG_EXCK_FREQ, IMX214_EXCK_FREQ(IMX214_DEFAULT_CLK_FREQ / 100000= 0) }, - /* global setting */ /* basic config */ { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, @@ -777,6 +754,24 @@ static int imx214_entity_init_state(struct v4l2_subdev= *subdev, return 0; } =20 +static int imx214_configure_pll(struct imx214 *imx214) +{ + int ret =3D 0; + + cci_write(imx214->regmap, IMX214_REG_VTPXCK_DIV, 5, &ret); + cci_write(imx214->regmap, IMX214_REG_VTSYCK_DIV, 2, &ret); + cci_write(imx214->regmap, IMX214_REG_PREPLLCK_VT_DIV, 3, &ret); + cci_write(imx214->regmap, IMX214_REG_PLL_VT_MPY, 150, &ret); + cci_write(imx214->regmap, IMX214_REG_OPPXCK_DIV, 10, &ret); + cci_write(imx214->regmap, IMX214_REG_OPSYCK_DIV, 1, &ret); + cci_write(imx214->regmap, IMX214_REG_PLL_MULT_DRIV, + IMX214_PLL_SINGLE, &ret); + cci_write(imx214->regmap, IMX214_REG_EXCK_FREQ, + IMX214_EXCK_FREQ(IMX214_DEFAULT_CLK_FREQ / 1000000), &ret); + + return ret; +} + static int imx214_update_digital_gain(struct imx214 *imx214, u32 val) { int ret =3D 0; @@ -1020,6 +1015,19 @@ static int imx214_start_streaming(struct imx214 *imx= 214) return ret; } =20 + ret =3D imx214_configure_pll(imx214); + if (ret) { + dev_err(imx214->dev, "failed to configure PLL %d\n", ret); + return ret; + } + + ret =3D cci_write(imx214->regmap, IMX214_REG_REQ_LINK_BIT_RATE, + IMX214_LINK_BIT_RATE_MBPS(4800), NULL); + if (ret) { + dev_err(imx214->dev, "failed to configure link bit rate\n"); + return ret; + } + ret =3D cci_write(imx214->regmap, IMX214_REG_CSI_LANE_MODE, IMX214_CSI_4_LANE_MODE, NULL); if (ret) { --=20 2.49.0 From nobody Sun Dec 14 19:20:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8CA38266F00; Wed, 21 May 2025 19:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; cv=none; b=Xs+c7fd5eQZOQ7WPT4PfLsvi9+7i9ST2SJO3Y0fyIKdqlkoSC+N0+wDH1tUTExg7ExvXuBS4q4HgRe28m9i02iCxlcVDiI9TeRSI8DYXlcbWAZDdcvE95wfoBkYR4vERe6pNZ3qX2DR7xgFdVFqDJBQYO0ga44fyOvGC06K15so= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; c=relaxed/simple; bh=LRJhXQ6iLDygCQYhczN5hMFfbOL5Jvz0GBM6jmWK+pY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aUr9d7QnACFWx26UZkTbvxym3lpCP4A+09fmT/ttqEsXlpzNIiwJJ5XREG23lVGs2XhOzRXLl1cun8AL/1g1bin5WOWOQ8kS2IedorRVKONoQmrCaaed+uAMKiiE/rpYj7TR6Wlq40tE5Uk7LDWsDY5YeXLzLfOYSAq6Z1O6fnw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=At8xlOru; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="At8xlOru" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2885AC4AF09; Wed, 21 May 2025 19:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747856151; bh=LRJhXQ6iLDygCQYhczN5hMFfbOL5Jvz0GBM6jmWK+pY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=At8xlOruX/Jh4CZ8DkFecfgJhpRZSGGro/r1hc/t1B6kwgXLNcs7bVHf4I515//8m Do3NupBOfq7LOdxmfqzsf18BaLgx2LwLnsDCuXJrUoQS9wcIbXJug0GAKpUv1IQG4+ xDOZ9sbxvC84YFxZ8nD/JBCRxM8CqgC+GWXeop7tOyJ+SczqaiiyaM6kOEKxoPThTl tyBnmPXrH7sM4OD6+0Jjp8i4aaXAE8EOrAQFRYvaUAcXgg1VXftzwvrft0NL9uhhau 9CFnyr5z1jc2uiHIbONyGEBmXivn1kbQa7mFyaFc4pXpunB38piltEhS5zpLxwROth NmfO9OkILUPZQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18E18C54ED1; Wed, 21 May 2025 19:35:51 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Wed, 21 May 2025 21:34:26 +0200 Subject: [PATCH v3 3/5] media: i2c: imx214: Make use of CCS PLL calculator Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250521-imx214_ccs_pll-v3-3-bfb4a2b53d14@apitzsch.eu> References: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> In-Reply-To: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> To: Ricardo Ribalda , Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Andr=C3=A9_Apitzsch?= , Ricardo Ribalda X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747856148; l=13278; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=FBCfdI7k5rwFFM+SICD7r4floray0sOoAqK5TX4Wa28=; b=665oiYdgGYJxvGd0UrseAlMGflFreR2a+cPjRBkaX7wsP+k4GRTS78GcjSsPQ/UXDTxYR+8vx 7ZjtA00OPMPCjHVyGAOhSQ3Z/FQ4D05nquC9q0KZKrXSproG+HGGsXb X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Calculate PLL parameters based on clock frequency and link frequency. Acked-by: Ricardo Ribalda Signed-off-by: Andr=C3=A9 Apitzsch --- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx214.c | 213 ++++++++++++++++++++++++++++++++++++-----= ---- 2 files changed, 175 insertions(+), 39 deletions(-) diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index e576b213084d232e90b7e556a7a855a3bb95544c..c8e24c42e0c4ea169f1b6cdc4f2= 631234a51c7d9 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -141,6 +141,7 @@ config VIDEO_IMX214 depends on GPIOLIB select REGMAP_I2C select V4L2_CCI_I2C + select VIDEO_CCS_PLL help This is a Video4Linux2 sensor driver for the Sony IMX214 camera. diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 3aca6ebb02d649c1b7f0b6a6049c1e3aa3d08951..19b494c08ece9894de67a4ee34c= 6f8e6e2708e41 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -20,6 +20,8 @@ #include #include =20 +#include "ccs-pll.h" + /* Chip ID */ #define IMX214_REG_CHIP_ID CCI_REG16(0x0016) #define IMX214_CHIP_ID 0x0214 @@ -34,7 +36,6 @@ #define IMX214_DEFAULT_LINK_FREQ 600000000 /* Keep wrong link frequency for backward compatibility */ #define IMX214_DEFAULT_LINK_FREQ_LEGACY 480000000 -#define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10) #define IMX214_FPS 30 =20 /* V-TIMING internal */ @@ -84,6 +85,7 @@ #define IMX214_CSI_DATA_FORMAT_RAW10 0x0A0A #define IMX214_CSI_DATA_FORMAT_COMP6 0x0A06 #define IMX214_CSI_DATA_FORMAT_COMP8 0x0A08 +#define IMX214_BITS_PER_PIXEL_MASK 0xFF =20 #define IMX214_REG_CSI_LANE_MODE CCI_REG8(0x0114) #define IMX214_CSI_2_LANE_MODE 1 @@ -249,6 +251,10 @@ struct imx214 { struct clk *xclk; struct regmap *regmap; =20 + struct ccs_pll pll; + + struct v4l2_fwnode_endpoint bus_cfg; + struct v4l2_subdev sd; struct media_pad pad; =20 @@ -758,16 +764,22 @@ static int imx214_configure_pll(struct imx214 *imx214) { int ret =3D 0; =20 - cci_write(imx214->regmap, IMX214_REG_VTPXCK_DIV, 5, &ret); - cci_write(imx214->regmap, IMX214_REG_VTSYCK_DIV, 2, &ret); - cci_write(imx214->regmap, IMX214_REG_PREPLLCK_VT_DIV, 3, &ret); - cci_write(imx214->regmap, IMX214_REG_PLL_VT_MPY, 150, &ret); - cci_write(imx214->regmap, IMX214_REG_OPPXCK_DIV, 10, &ret); - cci_write(imx214->regmap, IMX214_REG_OPSYCK_DIV, 1, &ret); + cci_write(imx214->regmap, IMX214_REG_VTPXCK_DIV, + imx214->pll.vt_bk.pix_clk_div, &ret); + cci_write(imx214->regmap, IMX214_REG_VTSYCK_DIV, + imx214->pll.vt_bk.sys_clk_div, &ret); + cci_write(imx214->regmap, IMX214_REG_PREPLLCK_VT_DIV, + imx214->pll.vt_fr.pre_pll_clk_div, &ret); + cci_write(imx214->regmap, IMX214_REG_PLL_VT_MPY, + imx214->pll.vt_fr.pll_multiplier, &ret); + cci_write(imx214->regmap, IMX214_REG_OPPXCK_DIV, + imx214->pll.op_bk.pix_clk_div, &ret); + cci_write(imx214->regmap, IMX214_REG_OPSYCK_DIV, + imx214->pll.op_bk.sys_clk_div, &ret); cci_write(imx214->regmap, IMX214_REG_PLL_MULT_DRIV, IMX214_PLL_SINGLE, &ret); cci_write(imx214->regmap, IMX214_REG_EXCK_FREQ, - IMX214_EXCK_FREQ(IMX214_DEFAULT_CLK_FREQ / 1000000), &ret); + IMX214_EXCK_FREQ(imx214->pll.ext_clk_freq_hz / 1000000), &ret); =20 return ret; } @@ -872,9 +884,6 @@ static const struct v4l2_ctrl_ops imx214_ctrl_ops =3D { =20 static int imx214_ctrls_init(struct imx214 *imx214) { - static const s64 link_freq[] =3D { - IMX214_DEFAULT_LINK_FREQ - }; static const struct v4l2_area unit_size =3D { .width =3D 1120, .height =3D 1120, @@ -895,15 +904,14 @@ static int imx214_ctrls_init(struct imx214 *imx214) if (ret) return ret; =20 - imx214->pixel_rate =3D v4l2_ctrl_new_std(ctrl_hdlr, NULL, - V4L2_CID_PIXEL_RATE, 0, - IMX214_DEFAULT_PIXEL_RATE, 1, - IMX214_DEFAULT_PIXEL_RATE); + imx214->pixel_rate =3D + v4l2_ctrl_new_std(ctrl_hdlr, NULL, V4L2_CID_PIXEL_RATE, 1, + INT_MAX, 1, 1); =20 imx214->link_freq =3D v4l2_ctrl_new_int_menu(ctrl_hdlr, NULL, V4L2_CID_LINK_FREQ, - ARRAY_SIZE(link_freq) - 1, - 0, link_freq); + imx214->bus_cfg.nr_of_link_frequencies - 1, + 0, imx214->bus_cfg.link_frequencies); if (imx214->link_freq) imx214->link_freq->flags |=3D V4L2_CTRL_FLAG_READ_ONLY; =20 @@ -1006,6 +1014,7 @@ static int imx214_start_streaming(struct imx214 *imx2= 14) const struct v4l2_mbus_framefmt *fmt; struct v4l2_subdev_state *state; const struct imx214_mode *mode; + int bit_rate_mbps; int ret; =20 ret =3D cci_multi_reg_write(imx214->regmap, mode_table_common, @@ -1021,8 +1030,10 @@ static int imx214_start_streaming(struct imx214 *imx= 214) return ret; } =20 + bit_rate_mbps =3D (imx214->pll.pixel_rate_csi / 1000000) + * imx214->pll.bits_per_pixel; ret =3D cci_write(imx214->regmap, IMX214_REG_REQ_LINK_BIT_RATE, - IMX214_LINK_BIT_RATE_MBPS(4800), NULL); + IMX214_LINK_BIT_RATE_MBPS(bit_rate_mbps), NULL); if (ret) { dev_err(imx214->dev, "failed to configure link bit rate\n"); return ret; @@ -1105,6 +1116,109 @@ static int imx214_s_stream(struct v4l2_subdev *subd= ev, int enable) return ret; } =20 +static int imx214_pll_calculate(struct imx214 *imx214, struct ccs_pll *pll, + unsigned int link_freq) +{ + struct ccs_pll_limits limits =3D { + .min_ext_clk_freq_hz =3D 6000000, + .max_ext_clk_freq_hz =3D 27000000, + + .vt_fr =3D { + .min_pre_pll_clk_div =3D 1, + .max_pre_pll_clk_div =3D 15, + /* Value is educated guess as we don't have a spec */ + .min_pll_ip_clk_freq_hz =3D 6000000, + /* Value is educated guess as we don't have a spec */ + .max_pll_ip_clk_freq_hz =3D 12000000, + .min_pll_multiplier =3D 12, + .max_pll_multiplier =3D 1200, + .min_pll_op_clk_freq_hz =3D 338000000, + .max_pll_op_clk_freq_hz =3D 1200000000, + }, + .vt_bk =3D { + .min_sys_clk_div =3D 2, + .max_sys_clk_div =3D 4, + .min_pix_clk_div =3D 5, + .max_pix_clk_div =3D 10, + .min_pix_clk_freq_hz =3D 30000000, + .max_pix_clk_freq_hz =3D 120000000, + }, + .op_bk =3D { + .min_sys_clk_div =3D 1, + .max_sys_clk_div =3D 2, + .min_pix_clk_div =3D 6, + .max_pix_clk_div =3D 10, + .min_pix_clk_freq_hz =3D 30000000, + .max_pix_clk_freq_hz =3D 120000000, + }, + + .min_line_length_pck_bin =3D IMX214_PPL_DEFAULT, + .min_line_length_pck =3D IMX214_PPL_DEFAULT, + }; + unsigned int num_lanes =3D imx214->bus_cfg.bus.mipi_csi2.num_data_lanes; + + /* + * There are no documented constraints on the sys clock frequency, for + * either branch. Recover them based on the PLL output clock frequency + * and sys_clk_div limits on one hand, and the pix clock frequency and + * the pix_clk_div limits on the other hand. + */ + limits.vt_bk.min_sys_clk_freq_hz =3D + max(limits.vt_fr.min_pll_op_clk_freq_hz / limits.vt_bk.max_sys_clk_div, + limits.vt_bk.min_pix_clk_freq_hz * limits.vt_bk.min_pix_clk_div); + limits.vt_bk.max_sys_clk_freq_hz =3D + min(limits.vt_fr.max_pll_op_clk_freq_hz / limits.vt_bk.min_sys_clk_div, + limits.vt_bk.max_pix_clk_freq_hz * limits.vt_bk.max_pix_clk_div); + + limits.op_bk.min_sys_clk_freq_hz =3D + max(limits.vt_fr.min_pll_op_clk_freq_hz / limits.op_bk.max_sys_clk_div, + limits.op_bk.min_pix_clk_freq_hz * limits.op_bk.min_pix_clk_div); + limits.op_bk.max_sys_clk_freq_hz =3D + min(limits.vt_fr.max_pll_op_clk_freq_hz / limits.op_bk.min_sys_clk_div, + limits.op_bk.max_pix_clk_freq_hz * limits.op_bk.max_pix_clk_div); + + memset(pll, 0, sizeof(*pll)); + + pll->bus_type =3D CCS_PLL_BUS_TYPE_CSI2_DPHY; + pll->op_lanes =3D num_lanes; + pll->vt_lanes =3D num_lanes; + pll->csi2.lanes =3D num_lanes; + + pll->binning_horizontal =3D 1; + pll->binning_vertical =3D 1; + pll->scale_m =3D 1; + pll->scale_n =3D 1; + pll->bits_per_pixel =3D + IMX214_CSI_DATA_FORMAT_RAW10 & IMX214_BITS_PER_PIXEL_MASK; + pll->flags =3D CCS_PLL_FLAG_LANE_SPEED_MODEL; + pll->link_freq =3D link_freq; + pll->ext_clk_freq_hz =3D clk_get_rate(imx214->xclk); + + return ccs_pll_calculate(imx214->dev, &limits, pll); +} + +static int imx214_pll_update(struct imx214 *imx214) +{ + u64 link_freq; + int ret; + + link_freq =3D imx214->bus_cfg.link_frequencies[imx214->link_freq->val]; + ret =3D imx214_pll_calculate(imx214, &imx214->pll, link_freq); + if (ret) { + dev_err(imx214->dev, "PLL calculations failed: %d\n", ret); + return ret; + } + + ret =3D v4l2_ctrl_s_ctrl_int64(imx214->pixel_rate, + imx214->pll.pixel_rate_pixel_array); + if (ret) { + dev_err(imx214->dev, "failed to set pixel rate\n"); + return ret; + } + + return 0; +} + static int imx214_get_frame_interval(struct v4l2_subdev *subdev, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_frame_interval *fival) @@ -1211,12 +1325,10 @@ static int imx214_identify_module(struct imx214 *im= x214) return 0; } =20 -static int imx214_parse_fwnode(struct device *dev) +static int imx214_parse_fwnode(struct device *dev, struct imx214 *imx214) { + struct v4l2_fwnode_endpoint *bus_cfg =3D &imx214->bus_cfg; struct fwnode_handle *endpoint; - struct v4l2_fwnode_endpoint bus_cfg =3D { - .bus_type =3D V4L2_MBUS_CSI2_DPHY, - }; unsigned int i; int ret; =20 @@ -1224,42 +1336,52 @@ static int imx214_parse_fwnode(struct device *dev) if (!endpoint) return dev_err_probe(dev, -EINVAL, "endpoint node not found\n"); =20 - ret =3D v4l2_fwnode_endpoint_alloc_parse(endpoint, &bus_cfg); + bus_cfg->bus_type =3D V4L2_MBUS_CSI2_DPHY; + ret =3D v4l2_fwnode_endpoint_alloc_parse(endpoint, bus_cfg); + fwnode_handle_put(endpoint); if (ret) { dev_err_probe(dev, ret, "parsing endpoint node failed\n"); - goto done; + goto error; } =20 /* Check the number of MIPI CSI2 data lanes */ - if (bus_cfg.bus.mipi_csi2.num_data_lanes !=3D 4) { + if (bus_cfg->bus.mipi_csi2.num_data_lanes !=3D 4) { ret =3D dev_err_probe(dev, -EINVAL, "only 4 data lanes are currently supported\n"); - goto done; + goto error; } =20 - if (bus_cfg.nr_of_link_frequencies !=3D 1) + if (bus_cfg->nr_of_link_frequencies !=3D 1) dev_warn(dev, "Only one link-frequency supported, please review your DT.= Continuing anyway\n"); =20 - for (i =3D 0; i < bus_cfg.nr_of_link_frequencies; i++) { - if (bus_cfg.link_frequencies[i] =3D=3D IMX214_DEFAULT_LINK_FREQ) + for (i =3D 0; i < bus_cfg->nr_of_link_frequencies; i++) { + u64 freq =3D bus_cfg->link_frequencies[i]; + struct ccs_pll pll; + + if (!imx214_pll_calculate(imx214, &pll, freq)) break; - if (bus_cfg.link_frequencies[i] =3D=3D - IMX214_DEFAULT_LINK_FREQ_LEGACY) { + if (freq =3D=3D IMX214_DEFAULT_LINK_FREQ_LEGACY) { dev_warn(dev, "link-frequencies %d not supported, please review your DT. Continuing= anyway\n", IMX214_DEFAULT_LINK_FREQ); + freq =3D IMX214_DEFAULT_LINK_FREQ; + if (imx214_pll_calculate(imx214, &pll, freq)) + continue; + bus_cfg->link_frequencies[i] =3D freq; break; } } =20 - if (i =3D=3D bus_cfg.nr_of_link_frequencies) + if (i =3D=3D bus_cfg->nr_of_link_frequencies) ret =3D dev_err_probe(dev, -EINVAL, - "link-frequencies %d not supported, please review your DT\n", - IMX214_DEFAULT_LINK_FREQ); + "link-frequencies %lld not supported, please review your DT\n", + bus_cfg->nr_of_link_frequencies ? + bus_cfg->link_frequencies[0] : 0); =20 -done: - v4l2_fwnode_endpoint_free(&bus_cfg); - fwnode_handle_put(endpoint); + return 0; + +error: + v4l2_fwnode_endpoint_free(&imx214->bus_cfg); return ret; } =20 @@ -1299,7 +1421,7 @@ static int imx214_probe(struct i2c_client *client) return dev_err_probe(dev, PTR_ERR(imx214->regmap), "failed to initialize CCI\n"); =20 - ret =3D imx214_parse_fwnode(dev); + ret =3D imx214_parse_fwnode(dev, imx214); if (ret) return ret; =20 @@ -1310,7 +1432,9 @@ static int imx214_probe(struct i2c_client *client) * Enable power initially, to avoid warnings * from clk_disable on power_off */ - imx214_power_on(imx214->dev); + ret =3D imx214_power_on(imx214->dev); + if (ret < 0) + goto error_fwnode; =20 ret =3D imx214_identify_module(imx214); if (ret) @@ -1341,6 +1465,12 @@ static int imx214_probe(struct i2c_client *client) pm_runtime_set_active(imx214->dev); pm_runtime_enable(imx214->dev); =20 + ret =3D imx214_pll_update(imx214); + if (ret < 0) { + dev_err_probe(dev, ret, "failed to update PLL\n"); + goto error_subdev_cleanup; + } + ret =3D v4l2_async_register_subdev_sensor(&imx214->sd); if (ret < 0) { dev_err_probe(dev, ret, @@ -1366,6 +1496,9 @@ static int imx214_probe(struct i2c_client *client) error_power_off: imx214_power_off(imx214->dev); =20 +error_fwnode: + v4l2_fwnode_endpoint_free(&imx214->bus_cfg); + return ret; } =20 @@ -1378,6 +1511,8 @@ static void imx214_remove(struct i2c_client *client) v4l2_subdev_cleanup(sd); media_entity_cleanup(&imx214->sd.entity); v4l2_ctrl_handler_free(&imx214->ctrls); + v4l2_fwnode_endpoint_free(&imx214->bus_cfg); + pm_runtime_disable(&client->dev); if (!pm_runtime_status_suspended(&client->dev)) { imx214_power_off(imx214->dev); --=20 2.49.0 From nobody Sun Dec 14 19:20:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8C88521FF45; Wed, 21 May 2025 19:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; cv=none; b=nLRr1LZffiVVXm5rackl+3PfiZ1JzZ8jfjgq72lHpjCc/r5PFAqC10JWBzzDgzPUCAtScb8aHFkwYyU470DyRoor9x3dG2ZPKjbcmeIqaZzYK3kqbeXFhMWXuoqwnp3vByI9OeegPDVTsHZ1GAR8CfhIbbSYww+yayG8xkaYlCc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856151; c=relaxed/simple; bh=LzIVfil1DJZQnhJzkjaE6xz4thMq1eqeBEY6tHDNioQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ecdJDcC+B6n0Wu2CgrZ7eBfgFrWGXFtLFzdk0IMHA6gPpGOmcQvMeEeg+XzXsDTHN1XcveDeXkw5zTDc5d6Lrmk2rbhxLvA79MsToqzrKGtxAaPsRkReI1pI2DkEBeYBI5ElZR9Pl1vuCqDcCcR6uPIVnGWitJ6WAUl988qsRo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RBMH2hs9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RBMH2hs9" Received: by smtp.kernel.org (Postfix) with ESMTPS id 37404C4CEF9; Wed, 21 May 2025 19:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747856151; bh=LzIVfil1DJZQnhJzkjaE6xz4thMq1eqeBEY6tHDNioQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=RBMH2hs9ZldPQmx1Zw0ayXV5TiQ7GnaK8gxNryAjtbP9LwNMWdel7vG3/R5mb2KAn ZTIH7ESot6eGUM8oZq5wfowNTm66mh0/UYeakj1BDUW/FagjVB99Nb5kNzClpkXmdM fHvfgKGe5/HJb8SRIJJOn5pLRn5zxeup8RX1sXx2HGz4c4YW78+vjkYXrXYS/hIxP0 ThUkmWCIirPFwSl97XCoi0oYFUHrhFd1fti9HWj9NOwXBVn5sg5HFjFsUtgOAXeEDt BeLBn6f1BXZ+9vznFT+zw9VyUBOKecAv7L1cCyX69xt7AmTahMbPSYzybbx3XHU9+U 6HysDS9j+V47A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 271C9C54E90; Wed, 21 May 2025 19:35:51 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Wed, 21 May 2025 21:34:27 +0200 Subject: [PATCH v3 4/5] media: dt-bindings: sony,imx214: Deprecate property clock-frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250521-imx214_ccs_pll-v3-4-bfb4a2b53d14@apitzsch.eu> References: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> In-Reply-To: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> To: Ricardo Ribalda , Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Andr=C3=A9_Apitzsch?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747856148; l=2752; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=q248WANyfYXH2di2+yApGW8UAy0ZsHlVSh2lDqEYoFQ=; b=fMIHmCJL1v1iZuTSYZ6ENcd5/dOvA5ENzFVPuWEFf9SKGAcd1JBcffZOY/yVDocUHUPdrFgHH 4AhtZB54XUyCdgODHriX/1pv8cUNJJ68/giLLr2Hq07AQeWNhHYWDNS X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Deprecate the clock-frequency property in favor of assigned-clock-rates. While at it, re-order properties according to coding style and fix the link-frequency in the example. See commit acc294519f17 ("media: i2c: imx214: Fix link frequency validation"). Signed-off-by: Andr=C3=A9 Apitzsch Acked-by: Conor Dooley Reviewed-by: Laurent Pinchart --- .../devicetree/bindings/media/i2c/sony,imx214.yaml | 29 ++++++++++++------= ---- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml b= /Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml index 0162eec8ca993a7614d29908f89fa9fe6d4b545d..aea99ebf8e9ed15f8066841228d= 9fdecc822b553 100644 --- a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml +++ b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml @@ -33,20 +33,21 @@ properties: =20 clock-frequency: description: Frequency of the xclk clock in Hz. + deprecated: true =20 enable-gpios: description: GPIO descriptor for the enable pin. maxItems: 1 =20 - vdddo-supply: - description: Chip digital IO regulator (1.8V). - vdda-supply: description: Chip analog regulator (2.7V). =20 vddd-supply: description: Chip digital core regulator (1.12V). =20 + vdddo-supply: + description: Chip digital IO regulator (1.8V). + flash-leds: true lens-focus: true =20 @@ -84,11 +85,10 @@ required: - compatible - reg - clocks - - clock-frequency - enable-gpios - - vdddo-supply - vdda-supply - vddd-supply + - vdddo-supply - port =20 unevaluatedProperties: false @@ -104,22 +104,25 @@ examples: camera-sensor@1a { compatible =3D "sony,imx214"; reg =3D <0x1a>; - vdddo-supply =3D <&pm8994_lvs1>; - vddd-supply =3D <&camera_vddd_1v12>; + + clocks =3D <&camera_clk>; + assigned-clocks =3D <&camera_clk>; + assigned-clock-rates =3D <24000000>; + + enable-gpios =3D <&msmgpio 25 GPIO_ACTIVE_HIGH>; + vdda-supply =3D <&pm8994_l17>; + vddd-supply =3D <&camera_vddd_1v12>; + vdddo-supply =3D <&pm8994_lvs1>; + lens-focus =3D <&ad5820>; - enable-gpios =3D <&msmgpio 25 GPIO_ACTIVE_HIGH>; - clocks =3D <&camera_clk>; - clock-frequency =3D <24000000>; =20 port { imx214_ep: endpoint { data-lanes =3D <1 2 3 4>; - link-frequencies =3D /bits/ 64 <480000000>; + link-frequencies =3D /bits/ 64 <600000000>; remote-endpoint =3D <&csiphy0_ep>; }; }; }; }; - -... --=20 2.49.0 From nobody Sun Dec 14 19:20:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6660D28FFC5; Wed, 21 May 2025 19:35:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856152; cv=none; b=psO7WjQ+0doVgdFzI93R00+KW8omOWFFCewuzCiKFdBf1hPzNAVcFvce/Ex87kXw5eIYtF25Roa38lPaHrYbcAo7cO0XwX1sp5JkpzzzrX1+WX+PnOyuX/AUKDcL/NxRihaOHG0MH58JVrMMES9J3pbdXUjeTJ8kHg2Z0fPoMVg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747856152; c=relaxed/simple; bh=rl9GZqdLGBfjBJ296zN0oZFwK2zvx5a8miUiRaAwWLs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uGYnDCcqI5h5Y7dJ0n7pIO2iMNKvDivTxpM5NeDbFWP4BuhkQ5Qa/Uftqu36+jUaqqJkqurGNOdIux/stpoQOK1krQTqlqYA3TtiVY3DnL77aXUGEhq4CISeRU4imn/me3V5lOfX1i/y/H2xeCb66k1xnxa2G0R+dynkYelGnN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HXjUXzLm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HXjUXzLm" Received: by smtp.kernel.org (Postfix) with ESMTPS id 42BD1C4CEFA; Wed, 21 May 2025 19:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1747856151; bh=rl9GZqdLGBfjBJ296zN0oZFwK2zvx5a8miUiRaAwWLs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=HXjUXzLmPZK8JxZv2rMAiyQMypnvz30SOWaF5Le6MSIj0SaMX1eXUlAwi6XVMMbDr /9o7RnnsdygXgNbIrerqIWF1oXtn+9OaMhes8HqGbzKGCRyBlPPP1nDBqLkmEF62+o AI+o5suaagx4IDgxqYXEqzpVDMQp2gAAN6wEP+IDuhTdM7IoUT1NftMlQBUMyWnH1S tfa4W/5+n+X7zGt9wMTcL9eD2sNmUJUud6aHRgFx019iGspx67lrR0y/ybu3+28oDJ 2DJcqVoY5+Cw/lu4eUvpTYpw6aBEsQzjHnGFW62Huf8OJdB/ilu8EV6eFlrvw+EC7H zsi+hsvUAkHHA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37109C54F2E; Wed, 21 May 2025 19:35:51 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Wed, 21 May 2025 21:34:28 +0200 Subject: [PATCH v3 5/5] media: i2c: imx214: Remove hard-coded external clock frequency Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250521-imx214_ccs_pll-v3-5-bfb4a2b53d14@apitzsch.eu> References: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> In-Reply-To: <20250521-imx214_ccs_pll-v3-0-bfb4a2b53d14@apitzsch.eu> To: Ricardo Ribalda , Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Andr=C3=A9_Apitzsch?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1747856148; l=1194; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=81a5knJurFPeQFihfZmv0dfoKheJNZM//Pf1vhwjDog=; b=u047Jl0beOhUD9XDWfSja6SNCQ6YB0IeZ8wgFG7Akslb+UIKriMBQ9i130y9Wed440+cMBspz QG7lRqWCUyCDV3miprXvcQ6wRM8n0Z/7cCMw+Mji4SqHPK7t5ohzqKG X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Instead rely on the rate set on the clock (using assigned-clock-rates etc.) Signed-off-by: Andr=C3=A9 Apitzsch Reviewed-by: Laurent Pinchart --- drivers/media/i2c/imx214.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 19b494c08ece9894de67a4ee34c6f8e6e2708e41..264e897ec6e8e3d2fcd9d58db82= 090c7dd85d526 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -32,7 +32,6 @@ =20 #define IMX214_REG_FAST_STANDBY_CTRL CCI_REG8(0x0106) =20 -#define IMX214_DEFAULT_CLK_FREQ 24000000 #define IMX214_DEFAULT_LINK_FREQ 600000000 /* Keep wrong link frequency for backward compatibility */ #define IMX214_DEFAULT_LINK_FREQ_LEGACY 480000000 @@ -1402,11 +1401,6 @@ static int imx214_probe(struct i2c_client *client) return dev_err_probe(dev, PTR_ERR(imx214->xclk), "failed to get xclk\n"); =20 - ret =3D clk_set_rate(imx214->xclk, IMX214_DEFAULT_CLK_FREQ); - if (ret) - return dev_err_probe(dev, ret, - "failed to set xclk frequency\n"); - ret =3D imx214_get_regulators(dev, imx214); if (ret < 0) return dev_err_probe(dev, ret, "failed to get regulators\n"); --=20 2.49.0