[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250821-95_cam-v3-16-c9286fbb34b9@nxp.com>
Date: Thu, 21 Aug 2025 16:15:51 -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 16/31] media: staging: media: imx6-mipi-csi2: use
runtime_pm frame to control clks
Enable runtime pm and use runtime pm API to control clocks.
Signed-off-by: Frank Li <Frank.Li@....com>
---
drivers/staging/media/imx/imx6-csi2.c | 4 ++++
drivers/staging/media/imx/imx6-mipi-csi2.c | 11 ++++++++---
include/media/dw-mipi-csi2.h | 18 ++++++++++++++++++
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/media/imx/imx6-csi2.c b/drivers/staging/media/imx/imx6-csi2.c
index 696644aa04c83b1f2877b2b2315202627d927e96..e5192bcd886958a27f4255fca1055ae0a94866ef 100644
--- a/drivers/staging/media/imx/imx6-csi2.c
+++ b/drivers/staging/media/imx/imx6-csi2.c
@@ -154,6 +154,9 @@ static void csi2_remove(struct platform_device *pdev)
dw_mipi_csi2_deinit(csi2);
}
+static DEFINE_RUNTIME_DEV_PM_OPS(imx6_csi2_pm_ops, dw_mipi_csi2_runtime_suspend,
+ dw_mipi_csi2_runtime_resume, NULL);
+
static const struct of_device_id csi2_dt_ids[] = {
{ .compatible = "fsl,imx6-mipi-csi2"},
{ /* sentinel */ }
@@ -164,6 +167,7 @@ static struct platform_driver csi2_driver = {
.driver = {
.name = "imx6-mipi-csi2",
.of_match_table = csi2_dt_ids,
+ .pm = pm_ptr(&imx6_csi2_pm_ops),
},
.probe = csi2_probe,
.remove = csi2_remove,
diff --git a/drivers/staging/media/imx/imx6-mipi-csi2.c b/drivers/staging/media/imx/imx6-mipi-csi2.c
index 8a8741e1c688756ee755e9a13991ccca893e5b5c..22e0021fab17f3c8e9a6c41c2f2109f5112dd6e5 100644
--- a/drivers/staging/media/imx/imx6-mipi-csi2.c
+++ b/drivers/staging/media/imx/imx6-mipi-csi2.c
@@ -273,7 +273,7 @@ static int csi2_start(struct dw_mipi_csi2_dev *csi2)
unsigned int lanes;
int ret;
- ret = clk_bulk_prepare_enable(csi2->num_clks, csi2->clks);
+ ret = pm_runtime_resume_and_get(csi2->dev);
if (ret)
return ret;
@@ -323,7 +323,7 @@ static int csi2_start(struct dw_mipi_csi2_dev *csi2)
err_assert_reset:
csi2_enable(csi2, false);
err_disable_clk:
- clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks);
+ pm_runtime_put(csi2->dev);
return ret;
}
@@ -334,7 +334,8 @@ static void csi2_stop(struct dw_mipi_csi2_dev *csi2)
v4l2_subdev_call(csi2->src_sd, video, post_streamoff);
csi2_enable(csi2, false);
- clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks);
+
+ pm_runtime_put(csi2->dev);
}
/*
@@ -634,6 +635,8 @@ int dw_mipi_csi2_init(struct platform_device *pdev, struct dw_mipi_csi2_dev *csi
csi2->tstif.write = dw_mipi_csi2_phy_write;
+ platform_set_drvdata(pdev, csi2);
+
if (!config)
return -EINVAL;
@@ -669,6 +672,8 @@ int dw_mipi_csi2_init(struct platform_device *pdev, struct dw_mipi_csi2_dev *csi
if (csi2->num_clks < 0)
return dev_err_probe(&pdev->dev, csi2->num_clks, "Failed to get clocks\n");
+ devm_pm_runtime_enable(&pdev->dev);
+
return csi2_async_register(csi2);
}
diff --git a/include/media/dw-mipi-csi2.h b/include/media/dw-mipi-csi2.h
index 935c664440aae82d69f0253a551b91ec4ff2724e..3d70c1f4f38e7d663f9b043d8903ce57d630d1b1 100644
--- a/include/media/dw-mipi-csi2.h
+++ b/include/media/dw-mipi-csi2.h
@@ -3,6 +3,8 @@
#ifndef __DW_MIPI_CSI2_COMMON_
#define __DW_MIPI_CSI2_COMMON_
+#include <linux/pm_runtime.h>
+
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
#include <media/v4l2-fwnode.h>
@@ -86,5 +88,21 @@ int dw_mipi_csi2_init(struct platform_device *pdev,
void dw_mipi_csi2_deinit(struct dw_mipi_csi2_dev *csi2);
+static inline int dw_mipi_csi2_runtime_suspend(struct device *dev)
+{
+ struct dw_mipi_csi2_dev *csi2 = dev_get_drvdata(dev);
+
+ clk_bulk_disable_unprepare(csi2->num_clks, csi2->clks);
+
+ return 0;
+}
+
+static inline int dw_mipi_csi2_runtime_resume(struct device *dev)
+{
+ struct dw_mipi_csi2_dev *csi2 = dev_get_drvdata(dev);
+
+ return clk_bulk_prepare_enable(csi2->num_clks, csi2->clks);
+}
+
#endif
--
2.34.1
Powered by blists - more mailing lists