From: Sakari Ailus <sakari.ailus@iki.fi>
To: Lubomir Rintel <lkundrak@v3.sk>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
linux-media@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
James Cameron <quozl@laptop.org>, Pavel Machek <pavel@ucw.cz>,
Libin Yang <lbyang@marvell.com>,
Albert Wang <twang13@marvell.com>
Subject: Re: [PATCH v3 03/14] media: ov7670: hook s_power onto v4l2 core
Date: Thu, 22 Nov 2018 14:21:46 +0200 [thread overview]
Message-ID: <20181122122146.a6wydozsg676i3w7@valkosipuli.retiisi.org.uk> (raw)
In-Reply-To: <20181120100318.367987-4-lkundrak@v3.sk>
Hi Lubomir,
On Tue, Nov 20, 2018 at 11:03:08AM +0100, Lubomir Rintel wrote:
> The commit 71862f63f351 ("media: ov7670: Add the ov7670_s_power function")
> added a power control routing. However, it was not good enough to use as
> a s_power() callback: it merely flipped on the power GPIOs without
> restoring the register settings.
>
> Fix this now and register an actual power callback.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
>
> ---
> Changes since v2:
> - Restore the controls, format and frame rate on power on
>
> drivers/media/i2c/ov7670.c | 50 +++++++++++++++++++++++++++++++++-----
> 1 file changed, 44 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
> index ead0c360df33..cbaab60aaaac 100644
> --- a/drivers/media/i2c/ov7670.c
> +++ b/drivers/media/i2c/ov7670.c
> @@ -242,6 +242,7 @@ struct ov7670_info {
> struct ov7670_format_struct *fmt; /* Current format */
> struct ov7670_win_size *wsize;
> struct clk *clk;
> + int on;
> struct gpio_desc *resetb_gpio;
> struct gpio_desc *pwdn_gpio;
> unsigned int mbus_config; /* Media bus configuration flags */
> @@ -1615,19 +1616,54 @@ static int ov7670_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_regis
> }
> #endif
>
> -static int ov7670_s_power(struct v4l2_subdev *sd, int on)
> +static void ov7670_power_on(struct v4l2_subdev *sd)
> {
> struct ov7670_info *info = to_state(sd);
>
> + if (info->on)
> + return;
> +
> if (info->pwdn_gpio)
> - gpiod_set_value(info->pwdn_gpio, !on);
> - if (on && info->resetb_gpio) {
> + gpiod_set_value(info->pwdn_gpio, 0);
> + if (info->resetb_gpio) {
> gpiod_set_value(info->resetb_gpio, 1);
> usleep_range(500, 1000);
> gpiod_set_value(info->resetb_gpio, 0);
> usleep_range(3000, 5000);
> }
>
> + info->on = true;
> +}
> +
> +static void ov7670_power_off(struct v4l2_subdev *sd)
> +{
> + struct ov7670_info *info = to_state(sd);
> +
> + if (!info->on)
> + return;
> +
> + if (info->pwdn_gpio)
> + gpiod_set_value(info->pwdn_gpio, 1);
> +
> + info->on = false;
> +}
> +
> +static int ov7670_s_power(struct v4l2_subdev *sd, int on)
> +{
> + struct ov7670_info *info = to_state(sd);
> +
> + if (info->on == on)
> + return 0;
> +
> + if (on) {
> + ov7670_power_on (sd);
> + ov7670_apply_fmt(sd);
> + ov7675_apply_framerate(sd);
> + v4l2_ctrl_handler_setup(&info->hdl);
> + } else {
> + ov7670_power_off (sd);
> + }
> +
> return 0;
> }
>
> @@ -1660,6 +1696,7 @@ static int ov7670_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
> static const struct v4l2_subdev_core_ops ov7670_core_ops = {
> .reset = ov7670_reset,
> .init = ov7670_init,
> + .s_power = ov7670_s_power,
> #ifdef CONFIG_VIDEO_ADV_DEBUG
> .g_register = ov7670_g_register,
> .s_register = ov7670_s_register,
> @@ -1825,6 +1862,7 @@ static int ov7670_probe(struct i2c_client *client,
> else
> return ret;
> }
> +
> if (info->clk) {
> ret = clk_prepare_enable(info->clk);
> if (ret)
> @@ -1841,7 +1879,7 @@ static int ov7670_probe(struct i2c_client *client,
> if (ret)
> goto clk_disable;
>
> - ov7670_s_power(sd, 1);
> + ov7670_power_on(sd);
>
> /* Make sure it's an ov7670 */
> ret = ov7670_detect(sd);
> @@ -1929,7 +1967,7 @@ static int ov7670_probe(struct i2c_client *client,
> hdl_free:
> v4l2_ctrl_handler_free(&info->hdl);
> power_off:
> - ov7670_s_power(sd, 0);
> + ov7670_power_off(sd);
> clk_disable:
> clk_disable_unprepare(info->clk);
> return ret;
> @@ -1945,7 +1983,7 @@ static int ov7670_remove(struct i2c_client *client)
> v4l2_ctrl_handler_free(&info->hdl);
> clk_disable_unprepare(info->clk);
> media_entity_cleanup(&info->sd.entity);
> - ov7670_s_power(sd, 0);
> + ov7670_power_off(sd);
> return 0;
> }
>
Could you consider instead switching to runtime PM? A few drivers such as
the ov2685 driver does that already.
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
next prev parent reply other threads:[~2018-11-22 23:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 10:03 [PATCH v3 0/14] media: make Marvell camera work on DT-based OLPC XO-1.75 Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 01/14] media: ov7670: split register setting from set_fmt() logic Lubomir Rintel
2018-11-22 18:37 ` jacopo mondi
2018-11-28 17:10 ` Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 02/14] media: ov7670: split register setting from set_framerate() logic Lubomir Rintel
2019-01-14 23:03 ` Sakari Ailus
2019-01-15 8:30 ` Lubomir Rintel
2019-01-15 8:45 ` Sakari Ailus
2018-11-20 10:03 ` [PATCH v3 03/14] media: ov7670: hook s_power onto v4l2 core Lubomir Rintel
2018-11-22 12:21 ` Sakari Ailus [this message]
2018-11-28 11:29 ` Lubomir Rintel
2019-01-10 16:59 ` Sakari Ailus
2019-01-13 16:38 ` Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 04/14] media: ov7670: control clock along with power Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 05/14] media: dt-bindings: marvell,mmp2-ccic: Add Marvell MMP2 camera Lubomir Rintel
2018-11-22 20:08 ` jacopo mondi
2019-04-25 14:28 ` Lubomir Rintel
2018-11-27 10:08 ` Sakari Ailus
2018-11-20 10:03 ` [PATCH v3 06/14] [media] marvell-ccic: fix DMA s/g desc number calculation Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 07/14] [media] marvell-ccic: don't generate EOF on parallel bus Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 08/14] Revert "[media] marvell-ccic: reset ccic phy when stop streaming for stability" Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 09/14] [media] marvell-ccic: drop unused stuff Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 10/14] [media] marvell-ccic/mmp: enable clock before accessing registers Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 11/14] [media] marvell-ccic: rename the clocks Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 12/14] [media] marvell-ccic/mmp: add devicetree support Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 13/14] [media] marvell-ccic: use async notifier to get the sensor Lubomir Rintel
2018-11-20 10:03 ` [PATCH v3 14/14] [media] marvell-ccic: provide a clock for " Lubomir Rintel
2018-11-23 7:44 ` jacopo mondi
2019-04-25 13:33 ` Lubomir Rintel
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=20181122122146.a6wydozsg676i3w7@valkosipuli.retiisi.org.uk \
--to=sakari.ailus@iki.fi \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=lbyang@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lkundrak@v3.sk \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=pavel@ucw.cz \
--cc=quozl@laptop.org \
--cc=robh+dt@kernel.org \
--cc=twang13@marvell.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).