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 v5 06/44] media: sun6i-csi: Use runtime pm for clocks and reset Date: Wed, 25 May 2022 21:05:39 +0200 [thread overview] Message-ID: <20220525190617.696344-7-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20220525190617.696344-1-paul.kocialkowski@bootlin.com> Wrap the clock and reset preparation into runtime pm functions for better organization of the code. Also fix the clock and reset enable order to first deassert reset, as recommended in Allwinner literature. Make the driver depend on PM while at it since runtime pm is mandatory for the driver to work. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> --- .../media/platform/sunxi/sun6i-csi/Kconfig | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 84 +++++++++++++------ 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig index 0345901617d4..965fbd937841 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && HAS_DMA && PM depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 800851f4e18c..31374d45eb9f 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) if (!enable) { regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, 0); + pm_runtime_put(dev); - clk_disable_unprepare(csi_dev->clock_ram); - clk_disable_unprepare(csi_dev->clock_mod); - reset_control_assert(csi_dev->reset); return 0; } - ret = clk_prepare_enable(csi_dev->clock_mod); - if (ret) { - dev_err(csi_dev->dev, "Enable csi clk err %d\n", ret); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } - - ret = clk_prepare_enable(csi_dev->clock_ram); - if (ret) { - dev_err(csi_dev->dev, "Enable clk_dram_csi clk err %d\n", ret); - goto clk_mod_disable; - } - - ret = reset_control_deassert(csi_dev->reset); - if (ret) { - dev_err(csi_dev->dev, "reset err %d\n", ret); - goto clk_ram_disable; - } regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, CSI_EN_CSI_EN); return 0; - -clk_ram_disable: - clk_disable_unprepare(csi_dev->clock_ram); -clk_mod_disable: - clk_disable_unprepare(csi_dev->clock_mod); - return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev, @@ -797,6 +775,56 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) return IRQ_HANDLED; } +static int sun6i_csi_suspend(struct device *dev) +{ + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev); + + reset_control_assert(csi_dev->reset); + clk_disable_unprepare(csi_dev->clock_ram); + clk_disable_unprepare(csi_dev->clock_mod); + + return 0; +} + +static int sun6i_csi_resume(struct device *dev) +{ + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev); + int ret; + + ret = reset_control_deassert(csi_dev->reset); + if (ret) { + dev_err(dev, "failed to deassert reset\n"); + return ret; + } + + ret = clk_prepare_enable(csi_dev->clock_mod); + if (ret) { + dev_err(dev, "failed to enable module clock\n"); + goto error_reset; + } + + ret = clk_prepare_enable(csi_dev->clock_ram); + if (ret) { + dev_err(dev, "failed to enable ram clock\n"); + goto error_clock_mod; + } + + return 0; + +error_clock_mod: + clk_disable_unprepare(csi_dev->clock_mod); + +error_reset: + reset_control_assert(csi_dev->reset); + + return ret; +} + +static const struct dev_pm_ops sun6i_csi_pm_ops = { + .runtime_suspend = sun6i_csi_suspend, + .runtime_resume = sun6i_csi_resume, +}; + static const struct regmap_config sun6i_csi_regmap_config = { .reg_bits = 32, .reg_stride = 4, @@ -876,6 +904,10 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, goto error_clock_rate_exclusive; } + /* Runtime PM */ + + pm_runtime_enable(dev); + return 0; error_clock_rate_exclusive: @@ -886,6 +918,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, static void sun6i_csi_resources_cleanup(struct sun6i_csi_device *csi_dev) { + pm_runtime_disable(csi_dev->dev); clk_rate_exclusive_put(csi_dev->clock_mod); } @@ -968,6 +1001,7 @@ static struct platform_driver sun6i_csi_platform_driver = { .driver = { .name = SUN6I_CSI_NAME, .of_match_table = of_match_ptr(sun6i_csi_of_match), + .pm = &sun6i_csi_pm_ops, }, }; -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
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 v5 06/44] media: sun6i-csi: Use runtime pm for clocks and reset Date: Wed, 25 May 2022 21:05:39 +0200 [thread overview] Message-ID: <20220525190617.696344-7-paul.kocialkowski@bootlin.com> (raw) In-Reply-To: <20220525190617.696344-1-paul.kocialkowski@bootlin.com> Wrap the clock and reset preparation into runtime pm functions for better organization of the code. Also fix the clock and reset enable order to first deassert reset, as recommended in Allwinner literature. Make the driver depend on PM while at it since runtime pm is mandatory for the driver to work. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com> --- .../media/platform/sunxi/sun6i-csi/Kconfig | 2 +- .../platform/sunxi/sun6i-csi/sun6i_csi.c | 84 +++++++++++++------ 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig index 0345901617d4..965fbd937841 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig @@ -2,7 +2,7 @@ config VIDEO_SUN6I_CSI tristate "Allwinner V3s Camera Sensor Interface driver" depends on V4L_PLATFORM_DRIVERS - depends on VIDEO_DEV && COMMON_CLK && HAS_DMA + depends on VIDEO_DEV && COMMON_CLK && HAS_DMA && PM depends on ARCH_SUNXI || COMPILE_TEST select MEDIA_CONTROLLER select VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 800851f4e18c..31374d45eb9f 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -152,40 +152,18 @@ int sun6i_csi_set_power(struct sun6i_csi_device *csi_dev, bool enable) if (!enable) { regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, 0); + pm_runtime_put(dev); - clk_disable_unprepare(csi_dev->clock_ram); - clk_disable_unprepare(csi_dev->clock_mod); - reset_control_assert(csi_dev->reset); return 0; } - ret = clk_prepare_enable(csi_dev->clock_mod); - if (ret) { - dev_err(csi_dev->dev, "Enable csi clk err %d\n", ret); + ret = pm_runtime_resume_and_get(dev); + if (ret < 0) return ret; - } - - ret = clk_prepare_enable(csi_dev->clock_ram); - if (ret) { - dev_err(csi_dev->dev, "Enable clk_dram_csi clk err %d\n", ret); - goto clk_mod_disable; - } - - ret = reset_control_deassert(csi_dev->reset); - if (ret) { - dev_err(csi_dev->dev, "reset err %d\n", ret); - goto clk_ram_disable; - } regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, CSI_EN_CSI_EN); return 0; - -clk_ram_disable: - clk_disable_unprepare(csi_dev->clock_ram); -clk_mod_disable: - clk_disable_unprepare(csi_dev->clock_mod); - return ret; } static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *csi_dev, @@ -797,6 +775,56 @@ static irqreturn_t sun6i_csi_interrupt(int irq, void *private) return IRQ_HANDLED; } +static int sun6i_csi_suspend(struct device *dev) +{ + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev); + + reset_control_assert(csi_dev->reset); + clk_disable_unprepare(csi_dev->clock_ram); + clk_disable_unprepare(csi_dev->clock_mod); + + return 0; +} + +static int sun6i_csi_resume(struct device *dev) +{ + struct sun6i_csi_device *csi_dev = dev_get_drvdata(dev); + int ret; + + ret = reset_control_deassert(csi_dev->reset); + if (ret) { + dev_err(dev, "failed to deassert reset\n"); + return ret; + } + + ret = clk_prepare_enable(csi_dev->clock_mod); + if (ret) { + dev_err(dev, "failed to enable module clock\n"); + goto error_reset; + } + + ret = clk_prepare_enable(csi_dev->clock_ram); + if (ret) { + dev_err(dev, "failed to enable ram clock\n"); + goto error_clock_mod; + } + + return 0; + +error_clock_mod: + clk_disable_unprepare(csi_dev->clock_mod); + +error_reset: + reset_control_assert(csi_dev->reset); + + return ret; +} + +static const struct dev_pm_ops sun6i_csi_pm_ops = { + .runtime_suspend = sun6i_csi_suspend, + .runtime_resume = sun6i_csi_resume, +}; + static const struct regmap_config sun6i_csi_regmap_config = { .reg_bits = 32, .reg_stride = 4, @@ -876,6 +904,10 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, goto error_clock_rate_exclusive; } + /* Runtime PM */ + + pm_runtime_enable(dev); + return 0; error_clock_rate_exclusive: @@ -886,6 +918,7 @@ static int sun6i_csi_resources_setup(struct sun6i_csi_device *csi_dev, static void sun6i_csi_resources_cleanup(struct sun6i_csi_device *csi_dev) { + pm_runtime_disable(csi_dev->dev); clk_rate_exclusive_put(csi_dev->clock_mod); } @@ -968,6 +1001,7 @@ static struct platform_driver sun6i_csi_platform_driver = { .driver = { .name = SUN6I_CSI_NAME, .of_match_table = of_match_ptr(sun6i_csi_of_match), + .pm = &sun6i_csi_pm_ops, }, }; -- 2.36.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-25 19:06 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-25 19:05 [PATCH v5 00/44] Allwinner A31/A83T MIPI CSI-2 and A31 ISP / CSI Rework Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 01/44] media: sun6i-csi: Define and use driver name and (reworked) description Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 02/44] media: sun6i-csi: Refactor main driver data structures Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 03/44] media: sun6i-csi: Tidy up platform code Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 04/44] media: sun6i-csi: Always set exclusive module clock rate Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 05/44] media: sun6i-csi: Define and use variant to get " Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski [this message] 2022-05-25 19:05 ` [PATCH v5 06/44] media: sun6i-csi: Use runtime pm for clocks and reset Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 07/44] media: sun6i-csi: Tidy up Kconfig Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 08/44] media: sun6i-csi: Tidy up v4l2 code Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 09/44] media: sun6i-csi: Tidy up video code Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 10/44] media: sun6i-csi: Pass and store csi device directly in " Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 11/44] media: sun6i-csi: Register the media device after creation Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 12/44] media: sun6i-csi: Remove controls handler from the driver Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 13/44] media: sun6i-csi: Add media ops with link notify callback Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 14/44] media: sun6i-csi: Introduce and use video helper functions Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 15/44] media: sun6i-csi: Move csi buffer definition to main header file Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 16/44] media: media-entity: Add helper to get a single enabled link Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 17/44] media: sun6i-csi: Add bridge v4l2 subdev with port management Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 18/44] media: sun6i-csi: Rename sun6i_video to sun6i_csi_capture Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 19/44] media: sun6i-csi: Add capture state using vsync for page flip Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 20/44] media: sun6i-csi: Rework register definitions, invert misleading fields Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 21/44] media: sun6i-csi: Add dimensions and format helpers to capture Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 22/44] media: sun6i-csi: Implement address configuration without indirection Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 23/44] media: sun6i-csi: Split stream sequences and irq code in capture Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 24/44] media: sun6i-csi: Move power management to runtime pm " Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 25/44] media: sun6i-csi: Move register configuration to capture Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:05 ` [PATCH v5 26/44] media: sun6i-csi: Rework capture format management with helper Paul Kocialkowski 2022-05-25 19:05 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 27/44] media: sun6i-csi: Remove custom format helper and rework configure Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 28/44] media: sun6i-csi: Add bridge dimensions and format helpers Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 29/44] media: sun6i-csi: Get mbus code from bridge instead of storing it Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 30/44] media: sun6i-csi: Tidy capture configure code Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 31/44] media: sun6i-csi: Introduce bridge format structure, list and helper Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 32/44] media: sun6i-csi: Introduce capture " Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 33/44] media: sun6i-csi: Configure registers from format tables Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 34/44] media: sun6i-csi: Introduce format match structure, list and helper Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 35/44] media: sun6i-csi: Implement capture link validation with logic Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 36/44] media: sun6i-csi: Get bridge subdev directly in capture stream ops Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 37/44] media: sun6i-csi: Move hardware control to the bridge Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 38/44] media: sun6i-csi: Rename the capture video device to sun6i-csi-capture Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 39/44] media: sun6i-csi: Cleanup headers and includes, update copyright lines Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 40/44] media: sun6i-csi: Add support for MIPI CSI-2 to the bridge code Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 41/44] media: sun6i-csi: Only configure capture when streaming Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 42/44] media: sun6i-csi: Add extra checks to the interrupt routine Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 43/44] media: sun6i-csi: Request a shared interrupt Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski 2022-05-25 19:06 ` [PATCH v5 44/44] MAINTAINERS: Add myself as sun6i-csi maintainer and rename/move entry Paul Kocialkowski 2022-05-25 19:06 ` Paul Kocialkowski
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=20220525190617.696344-7-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.