| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250821-95_cam-v3-6-c9286fbb34b9@nxp.com>
Date: Thu, 21 Aug 2025 16:15:41 -0400
From: Frank Li <Frank.Li@....com>
To: Rui Miguel Silva <rmfrfs@...il.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Martin Kepplinger <martink@...teo.de>, Purism Kernel Team <kernel@...i.sm>,
Mauro Carvalho Chehab <mchehab@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Eugen Hristev <eugen.hristev@...aro.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>, Peng Fan <peng.fan@....com>,
Alice Yuan <alice.yuan@....com>, Vinod Koul <vkoul@...nel.org>,
Kishon Vijay Abraham I <kishon@...nel.org>,
Philipp Zabel <p.zabel@...gutronix.de>,
Steve Longerbeam <slongerbeam@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: linux-media@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-phy@...ts.infradead.org,
linux-staging@...ts.linux.dev, Frank Li <Frank.Li@....com>
Subject: [PATCH v3 06/31] media: staging: media: imx6-mipi-csi2: use
devm_clk_bulk_get_all() to fetch clocks
Use devm_clk_bulk_get_all_enabled() helper to simplify clock handling.
Defer all clock prepare and enable to csi2_start(), which previous only
enable pix clock here.
We can safely do that because there are not register access before
csi2_start().
Signed-off-by: Frank Li <Frank.Li@....com>
---
drivers/staging/media/imx/imx6-mipi-csi2.c | 52 ++++++------------------------
1 file changed, 9 insertions(+), 43 deletions(-)
diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index eba9a650030f5e380aa900b94728ad375171c6a5..32ddcef7ec8535a44e121754bb621c0d2e226369 100644
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -39,11 +39,11 @@ struct csi2_dev {
struct v4l2_subdev sd;
struct v4l2_async_notifier notifier;
struct media_pad pad[CSI2_NUM_PADS];
- struct clk *dphy_clk;
- struct clk *pllref_clk;
- struct clk *pix_clk; /* what is this? */
void __iomem *base;
+ struct clk_bulk_data *clks;
+ int num_clks;
+
struct v4l2_subdev *remote;
unsigned int remote_pad;
unsigned short data_lanes;
@@ -343,7 +343,7 @@ static int csi2_start(struct csi2_dev *csi2)
unsigned int lanes;
int ret;
- ret = clk_prepare_enable(csi2->pix_clk);
+ ret = clk_bulk_prepare_enable(csi2->num_clks, csi2->clks);
if (ret)
return ret;
@@ -390,7 +390,7 @@ static int csi2_start(struct csi2_dev *csi2)
err_assert_reset:
csi2_enable(csi2, false);
err_disable_clk:
- clk_disable_unprepare(csi2->pix_clk);
+ clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks);
return ret;
}
@@ -401,7 +401,7 @@ static void csi2_stop(struct csi2_dev *csi2)
v4l2_subdev_call(csi2->src_sd, video, post_streamoff);
csi2_enable(csi2, false);
- clk_disable_unprepare(csi2->pix_clk);
+ clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks);
}
/*
@@ -761,24 +761,6 @@ static int csi2_probe(struct platform_device *pdev)
if (ret)
return ret;
- csi2->pllref_clk = devm_clk_get(&pdev->dev, "ref");
- if (IS_ERR(csi2->pllref_clk)) {
- v4l2_err(&csi2->sd, "failed to get pll reference clock\n");
- return PTR_ERR(csi2->pllref_clk);
- }
-
- csi2->dphy_clk = devm_clk_get(&pdev->dev, "dphy");
- if (IS_ERR(csi2->dphy_clk)) {
- v4l2_err(&csi2->sd, "failed to get dphy clock\n");
- return PTR_ERR(csi2->dphy_clk);
- }
-
- csi2->pix_clk = devm_clk_get(&pdev->dev, "pix");
- if (IS_ERR(csi2->pix_clk)) {
- v4l2_err(&csi2->sd, "failed to get pixel clock\n");
- return PTR_ERR(csi2->pix_clk);
- }
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
v4l2_err(&csi2->sd, "failed to get platform resources\n");
@@ -791,19 +773,9 @@ static int csi2_probe(struct platform_device *pdev)
mutex_init(&csi2->lock);
- ret = clk_prepare_enable(csi2->pllref_clk);
- if (ret) {
- v4l2_err(&csi2->sd, "failed to enable pllref_clk\n");
- goto rmmutex;
- }
-
- ret = clk_prepare_enable(csi2->dphy_clk);
- if (ret) {
- v4l2_err(&csi2->sd, "failed to enable dphy_clk\n");
- goto pllref_off;
- }
-
- platform_set_drvdata(pdev, &csi2->sd);
+ csi2->num_clks = devm_clk_bulk_get_all(&pdev->dev, &csi2->clks);
+ if (csi2->num_clks < 0)
+ return dev_err_probe(&pdev->dev, csi2->num_clks, "Failed to get clocks\n");
ret = csi2_async_register(csi2);
if (ret)
@@ -812,10 +784,6 @@ static int csi2_probe(struct platform_device *pdev)
return 0;
clean_notifier:
- clk_disable_unprepare(csi2->dphy_clk);
-pllref_off:
- clk_disable_unprepare(csi2->pllref_clk);
-rmmutex:
mutex_destroy(&csi2->lock);
return ret;
}
@@ -826,8 +794,6 @@ static void csi2_remove(struct platform_device *pdev)
struct csi2_dev *csi2 = sd_to_dev(sd);
v4l2_async_unregister_subdev(sd);
- clk_disable_unprepare(csi2->dphy_clk);
- clk_disable_unprepare(csi2->pllref_clk);
mutex_destroy(&csi2->lock);
media_entity_cleanup(&sd->entity);
}
--
2.34.1
Powered by blists - more mailing lists