From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Cc: Yong Deng <yong.deng@magewell.com>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v6 04/43] media: sun6i-csi: Always set exclusive module clock rate
Date: Fri, 26 Aug 2022 20:32:01 +0200 [thread overview]
Message-ID: <20220826183240.604834-5-paul.kocialkowski@bootlin.com> (raw)
In-Reply-To: <20220826183240.604834-1-paul.kocialkowski@bootlin.com>
In some situations the default rate of the module clock is not the
required one for operation (for example when reconfiguring the clock
tree to use a different parent). As a result, always set the correct
rate for the clock (and take care of cleanup).
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
.../platform/sunxi/sun6i-csi/sun6i_csi.c | 54 ++++++++++++++-----
1 file changed, 41 insertions(+), 13 deletions(-)
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
index 514f97d67c1c..89a15cd779ac 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
@@ -154,9 +154,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)
regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, 0);
clk_disable_unprepare(csi_dev->clock_ram);
- if (of_device_is_compatible(dev->of_node,
- "allwinner,sun50i-a64-csi"))
- clk_rate_exclusive_put(csi_dev->clock_mod);
clk_disable_unprepare(csi_dev->clock_mod);
reset_control_assert(csi_dev->reset);
return 0;
@@ -168,9 +165,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)
return ret;
}
- if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi"))
- clk_set_rate_exclusive(csi_dev->clock_mod, 300000000);
-
ret = clk_prepare_enable(csi_dev->clock_ram);
if (ret) {
dev_err(csi_dev->dev, "Enable clk_dram_csi clk err %d\n", ret);
@@ -190,8 +184,6 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable)
clk_ram_disable:
clk_disable_unprepare(csi_dev->clock_ram);
clk_mod_disable:
- if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi"))
- clk_rate_exclusive_put(csi_dev->clock_mod);
clk_disable_unprepare(csi_dev->clock_mod);
return ret;
}
@@ -816,6 +808,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
struct platform_device *platform_dev)
{
struct device *dev = csi_dev->dev;
+ unsigned long clock_mod_rate;
void __iomem *io_base;
int ret;
int irq;
@@ -847,28 +840,53 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev,
return PTR_ERR(csi_dev->clock_ram);
}
+ if (of_device_is_compatible(dev->of_node, "allwinner,sun50i-a64-csi"))
+ clock_mod_rate = 300000000;
+ else
+ clock_mod_rate = 297000000;
+
+ ret = clk_set_rate_exclusive(csi_dev->clock_mod, clock_mod_rate);
+ if (ret) {
+ dev_err(dev, "failed to set mod clock rate\n");
+ return ret;
+ }
+
/* Reset */
csi_dev->reset = devm_reset_control_get_shared(dev, NULL);
if (IS_ERR(csi_dev->reset)) {
dev_err(dev, "failed to acquire reset\n");
- return PTR_ERR(csi_dev->reset);
+ ret = PTR_ERR(csi_dev->reset);
+ goto error_clock_rate_exclusive;
}
/* Interrupt */
irq = platform_get_irq(platform_dev, 0);
- if (irq < 0)
- return -ENXIO;
+ if (irq < 0) {
+ dev_err(dev, "failed to get interrupt\n");
+ ret = -ENXIO;
+ goto error_clock_rate_exclusive;
+ }
ret = devm_request_irq(dev, irq, sun6i_csi_interrupt, 0, SUN6I_CSI_NAME,
csi_dev);
if (ret) {
dev_err(dev, "failed to request interrupt\n");
- return ret;
+ goto error_clock_rate_exclusive;
}
return 0;
+
+error_clock_rate_exclusive:
+ clk_rate_exclusive_put(csi_dev->clock_mod);
+
+ return ret;
+}
+
+static void sun6i_csi_resources_cleanup(struct sun6i_csi_device *csi_dev)
+{
+ clk_rate_exclusive_put(csi_dev->clock_mod);
}
static int sun6i_csi_probe(struct platform_device *platform_dev)
@@ -888,7 +906,16 @@ static int sun6i_csi_probe(struct platform_device *platform_dev)
if (ret)
return ret;
- return sun6i_csi_v4l2_init(csi_dev);
+ ret = sun6i_csi_v4l2_init(csi_dev);
+ if (ret)
+ goto error_resources;
+
+ return 0;
+
+error_resources:
+ sun6i_csi_resources_cleanup(csi_dev);
+
+ return ret;
}
static int sun6i_csi_remove(struct platform_device *pdev)
@@ -896,6 +923,7 @@ static int sun6i_csi_remove(struct platform_device *pdev)
struct sun6i_csi_device *csi_dev = platform_get_drvdata(pdev);
sun6i_csi_v4l2_cleanup(csi_dev);
+ sun6i_csi_resources_cleanup(csi_dev);
return 0;
}
--
2.37.1
next prev parent reply other threads:[~2022-08-26 18:33 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 18:31 [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 01/43] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski
2022-08-26 18:31 ` [PATCH v6 02/43] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 03/43] media: sun6i-csi: Tidy up platform code Paul Kocialkowski
2022-08-26 18:32 ` Paul Kocialkowski [this message]
2022-08-26 18:32 ` [PATCH v6 05/43] media: sun6i-csi: Define and use variant to get module clock rate Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 06/43] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 07/43] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 08/43] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 09/43] media: sun6i-csi: Tidy up video code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 10/43] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 11/43] media: sun6i-csi: Register the media device after creation Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 12/43] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski
2022-10-31 9:06 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 13/43] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 14/43] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 15/43] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 16/43] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski
2022-10-31 9:10 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 17/43] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 18/43] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski
2022-10-31 9:15 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 19/43] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 20/43] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 21/43] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 22/43] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 23/43] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 24/43] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 25/43] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 26/43] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 27/43] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 28/43] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 29/43] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 30/43] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 31/43] media: sun6i-csi: Introduce capture " Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 32/43] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 33/43] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 34/43] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 35/43] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 36/43] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski
2022-10-31 9:18 ` Jernej Škrabec
2022-08-26 18:32 ` [PATCH v6 37/43] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 38/43] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 39/43] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 40/43] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 41/43] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 42/43] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski
2022-08-26 18:32 ` [PATCH v6 43/43] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski
2022-09-07 8:47 ` [PATCH v6 00/43] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Hans Verkuil
2022-09-07 10:03 ` Paul Kocialkowski
2022-10-21 14:13 ` Paul Kocialkowski
2022-10-31 9:21 ` Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220826183240.604834-5-paul.kocialkowski@bootlin.com \
--to=paul.kocialkowski@bootlin.com \
--cc=jernej.skrabec@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.org \
--cc=yong.deng@magewell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).