From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D24BC43441 for ; Wed, 28 Nov 2018 11:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 148C02081B for ; Wed, 28 Nov 2018 11:29:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 148C02081B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=v3.sk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728088AbeK1WbC (ORCPT ); Wed, 28 Nov 2018 17:31:02 -0500 Received: from shell.v3.sk ([90.176.6.54]:37728 "EHLO shell.v3.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727476AbeK1WbC (ORCPT ); Wed, 28 Nov 2018 17:31:02 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id 151F2989A3; Wed, 28 Nov 2018 12:29:39 +0100 (CET) Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id X0_dvJbXB4v5; Wed, 28 Nov 2018 12:29:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zimbra.v3.sk (Postfix) with ESMTP id C18BB989B2; Wed, 28 Nov 2018 12:29:35 +0100 (CET) X-Virus-Scanned: amavisd-new at zimbra.v3.sk Received: from shell.v3.sk ([127.0.0.1]) by localhost (zimbra.v3.sk [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id efbIHuhGnyHC; Wed, 28 Nov 2018 12:29:35 +0100 (CET) Received: from belphegor (nat-pool-brq-t.redhat.com [213.175.37.10]) by zimbra.v3.sk (Postfix) with ESMTPSA id A66AB989A3; Wed, 28 Nov 2018 12:29:34 +0100 (CET) Message-ID: <868bd721260bc8948835fe2a697a047ae2277cd0.camel@v3.sk> Subject: Re: [PATCH v3 03/14] media: ov7670: hook s_power onto v4l2 core From: Lubomir Rintel To: Sakari Ailus Cc: Mauro Carvalho Chehab , Jonathan Corbet , linux-media@vger.kernel.org, Rob Herring , Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, James Cameron , Pavel Machek , Libin Yang , Albert Wang Date: Wed, 28 Nov 2018 12:29:33 +0100 In-Reply-To: <20181122122146.a6wydozsg676i3w7@valkosipuli.retiisi.org.uk> References: <20181120100318.367987-1-lkundrak@v3.sk> <20181120100318.367987-4-lkundrak@v3.sk> <20181122122146.a6wydozsg676i3w7@valkosipuli.retiisi.org.uk> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.2 (3.30.2-2.fc29) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2018-11-22 at 14:21 +0200, Sakari Ailus wrote: > 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 > > > > --- > > 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. Yes, I'll take a look. Thanks for the suggestion. I didn't know such thing exists, so it may take some time for me to grasp it though. Take care, Lubo >