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=-11.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 9E5D4C4727F for ; Tue, 29 Sep 2020 09:17:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EC4920848 for ; Tue, 29 Sep 2020 09:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727980AbgI2JRN (ORCPT ); Tue, 29 Sep 2020 05:17:13 -0400 Received: from mga03.intel.com ([134.134.136.65]:31792 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbgI2JRN (ORCPT ); Tue, 29 Sep 2020 05:17:13 -0400 IronPort-SDR: rfv/cNozREQ1CuhVHeAboTC1BbE7OMgijqB9oibH/EiO+jtzm0ukfqX26hhuz6ik5lXWfJ8PEq QDT/kFTCLjpA== X-IronPort-AV: E=McAfee;i="6000,8403,9758"; a="162214006" X-IronPort-AV: E=Sophos;i="5.77,317,1596524400"; d="scan'208";a="162214006" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 02:17:10 -0700 IronPort-SDR: dR0v/GG9iY2ps19waNZ0R24yxWfRp4kUM6WLHLR0zm2IpE7Huydwo4xp/yRTIGgy0/7NhYyCPp G85XSZjN5e/g== X-IronPort-AV: E=Sophos;i="5.77,317,1596524400"; d="scan'208";a="338555751" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 02:17:07 -0700 Received: by paasikivi.fi.intel.com (Postfix, from userid 1000) id 0B902204FD; Tue, 29 Sep 2020 12:17:05 +0300 (EEST) Date: Tue, 29 Sep 2020 12:17:04 +0300 From: Sakari Ailus To: Krzysztof Kozlowski Cc: Mauro Carvalho Chehab , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 4/4] media: i2c: imx258: get clock from device properties and enable it via runtime PM Message-ID: <20200929091704.GG26842@paasikivi.fi.intel.com> References: <20200923152129.21736-1-krzk@kernel.org> <20200923152129.21736-4-krzk@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200923152129.21736-4-krzk@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Krzysztof, On Wed, Sep 23, 2020 at 05:21:29PM +0200, Krzysztof Kozlowski wrote: > The IMX258 sensor driver checked in device properties for a > clock-frequency property which actually does not mean that the clock is > really running such frequency or is it even enabled. > > Get the provided clock and check it frequency. If none is provided, > fall back to old property. > > Enable the clock when accessing the IMX258 registers and when streaming > starts with runtime PM. > > Signed-off-by: Krzysztof Kozlowski > > --- > > Changes since v3: > 1. None > > Changes since v2: > 1. Do not try to set drvdata, wrap lines. > 2. Use dev_dbg. > > Changes since v1: > 1. Use runtime PM for clock toggling > --- > drivers/media/i2c/imx258.c | 71 +++++++++++++++++++++++++++++++++----- > 1 file changed, 62 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c > index ae183b0dbba9..7bedbfe5c4d6 100644 > --- a/drivers/media/i2c/imx258.c > +++ b/drivers/media/i2c/imx258.c > @@ -2,6 +2,7 @@ > // Copyright (C) 2018 Intel Corporation > > #include > +#include > #include > #include > #include > @@ -68,6 +69,9 @@ > #define REG_CONFIG_MIRROR_FLIP 0x03 > #define REG_CONFIG_FLIP_TEST_PATTERN 0x02 > > +/* Input clock frequency in Hz */ > +#define IMX258_INPUT_CLOCK_FREQ 19200000 > + > struct imx258_reg { > u16 address; > u8 val; > @@ -610,6 +614,8 @@ struct imx258 { > > /* Streaming on/off */ > bool streaming; > + > + struct clk *clk; > }; > > static inline struct imx258 *to_imx258(struct v4l2_subdev *_sd) > @@ -972,6 +978,29 @@ static int imx258_stop_streaming(struct imx258 *imx258) > return 0; > } > > +static int imx258_power_on(struct device *dev) > +{ > + struct v4l2_subdev *sd = dev_get_drvdata(dev); > + struct imx258 *imx258 = to_imx258(sd); > + int ret; > + > + ret = clk_prepare_enable(imx258->clk); > + if (ret) > + dev_err(dev, "failed to enable clock\n"); > + > + return ret; > +} > + > +static int imx258_power_off(struct device *dev) > +{ > + struct v4l2_subdev *sd = dev_get_drvdata(dev); > + struct imx258 *imx258 = to_imx258(sd); > + > + clk_disable_unprepare(imx258->clk); > + > + return 0; > +} > + > static int imx258_set_stream(struct v4l2_subdev *sd, int enable) > { > struct imx258 *imx258 = to_imx258(sd); > @@ -1199,9 +1228,28 @@ static int imx258_probe(struct i2c_client *client) > int ret; > u32 val = 0; > > - device_property_read_u32(&client->dev, "clock-frequency", &val); > - if (val != 19200000) > - return -EINVAL; > + imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); > + if (!imx258) > + return -ENOMEM; > + > + imx258->clk = devm_clk_get_optional(&client->dev, NULL); > + if (!imx258->clk) { > + dev_dbg(&client->dev, > + "no clock provided, using clock-frequency property\n"); > + > + device_property_read_u32(&client->dev, "clock-frequency", &val); > + if (val != IMX258_INPUT_CLOCK_FREQ) > + return -EINVAL; > + } else if (IS_ERR(imx258->clk)) { > + return dev_err_probe(&client->dev, PTR_ERR(imx258->clk), > + "error getting clock\n"); > + } else { > + if (clk_get_rate(imx258->clk) != IMX258_INPUT_CLOCK_FREQ) { > + dev_err(&client->dev, > + "input clock frequency not supported\n"); > + return -EINVAL; > + } > + } > > /* > * Check that the device is mounted upside down. The driver only > @@ -1211,24 +1259,25 @@ static int imx258_probe(struct i2c_client *client) > if (ret || val != 180) > return -EINVAL; > > - imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); > - if (!imx258) > - return -ENOMEM; > - > /* Initialize subdev */ > v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops); > > + /* Will be powered off via pm_runtime_idle */ > + ret = imx258_power_on(&client->dev); > + if (ret) > + return ret; > + > /* Check module identity */ > ret = imx258_identify_module(imx258); > if (ret) > - return ret; > + goto error_identify; > > /* Set default mode to max resolution */ > imx258->cur_mode = &supported_modes[0]; > > ret = imx258_init_controls(imx258); > if (ret) > - return ret; > + goto error_identify; > > /* Initialize subdev */ > imx258->sd.internal_ops = &imx258_internal_ops; > @@ -1258,6 +1307,9 @@ static int imx258_probe(struct i2c_client *client) > error_handler_free: > imx258_free_controls(imx258); > > +error_identify: > + imx258_power_off(&client->dev); You'll need this in remove callback, too. > + > return ret; > } > > @@ -1278,6 +1330,7 @@ static int imx258_remove(struct i2c_client *client) > > static const struct dev_pm_ops imx258_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(imx258_suspend, imx258_resume) > + SET_RUNTIME_PM_OPS(imx258_power_off, imx258_power_on, NULL) > }; > > #ifdef CONFIG_ACPI -- Kind regards, Sakari Ailus 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=-12.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 D3E0EC4346E for ; Tue, 29 Sep 2020 09:19:27 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47AD920848 for ; Tue, 29 Sep 2020 09:19:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="wEO9YO6Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47AD920848 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=enkLwlHcAAqaJTyPhFDuMcw0zPFHp716lcNy88z6M+A=; b=wEO9YO6ZzoeKuaPrBb+ON0PY9 jLYoYl3D3YqD/OMRwL39+Gq+Uoq4cw1uvWVj/VY+qbCAf9yeXyCD1PAmeu9qjBYauCUGU9P5ypSlG IrlRauJDv+rY72sV8WtejRmvdeb9vYpQXXNh/upBBk/1h9NAT+whti/4iLQdD5nTksbqlxcF6O7LJ 4CqOKc6ZvM+IiCvdGcB4vTnefPfkOsR3ibS69aWJHTjZErLscyBt/dq8+N16KbJ64ljoPt8NOJa6j lVo7KvoZXlGDQkzBT+GFuy+7LazYJw00dEOapAYhP8wvI44WHAT16ku2icQWcVMy+2Wh31FbLF9oB 8DnSukS9A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNBle-0003NX-Tq; Tue, 29 Sep 2020 09:17:51 +0000 Received: from mga12.intel.com ([192.55.52.136]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNBlC-0003DP-V2 for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2020 09:17:35 +0000 IronPort-SDR: cr/qBkEX0gEzcQofQmJcCKuXK7iCWHbczKhFtQyZSfU+tUaNVrSGmaE7Tf08EP+uKaKV49pMCe WcT0Uz+rGcyA== X-IronPort-AV: E=McAfee;i="6000,8403,9758"; a="141555272" X-IronPort-AV: E=Sophos;i="5.77,317,1596524400"; d="scan'208";a="141555272" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 02:17:09 -0700 IronPort-SDR: dR0v/GG9iY2ps19waNZ0R24yxWfRp4kUM6WLHLR0zm2IpE7Huydwo4xp/yRTIGgy0/7NhYyCPp G85XSZjN5e/g== X-IronPort-AV: E=Sophos;i="5.77,317,1596524400"; d="scan'208";a="338555751" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2020 02:17:07 -0700 Received: by paasikivi.fi.intel.com (Postfix, from userid 1000) id 0B902204FD; Tue, 29 Sep 2020 12:17:05 +0300 (EEST) Date: Tue, 29 Sep 2020 12:17:04 +0300 From: Sakari Ailus To: Krzysztof Kozlowski Subject: Re: [PATCH v4 4/4] media: i2c: imx258: get clock from device properties and enable it via runtime PM Message-ID: <20200929091704.GG26842@paasikivi.fi.intel.com> References: <20200923152129.21736-1-krzk@kernel.org> <20200923152129.21736-4-krzk@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200923152129.21736-4-krzk@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_051723_157419_1CA270DF X-CRM114-Status: GOOD ( 34.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Shawn Guo , Sascha Hauer , linux-kernel@vger.kernel.org, Rob Herring , NXP Linux Team , Pengutronix Kernel Team , Mauro Carvalho Chehab , Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Krzysztof, On Wed, Sep 23, 2020 at 05:21:29PM +0200, Krzysztof Kozlowski wrote: > The IMX258 sensor driver checked in device properties for a > clock-frequency property which actually does not mean that the clock is > really running such frequency or is it even enabled. > > Get the provided clock and check it frequency. If none is provided, > fall back to old property. > > Enable the clock when accessing the IMX258 registers and when streaming > starts with runtime PM. > > Signed-off-by: Krzysztof Kozlowski > > --- > > Changes since v3: > 1. None > > Changes since v2: > 1. Do not try to set drvdata, wrap lines. > 2. Use dev_dbg. > > Changes since v1: > 1. Use runtime PM for clock toggling > --- > drivers/media/i2c/imx258.c | 71 +++++++++++++++++++++++++++++++++----- > 1 file changed, 62 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c > index ae183b0dbba9..7bedbfe5c4d6 100644 > --- a/drivers/media/i2c/imx258.c > +++ b/drivers/media/i2c/imx258.c > @@ -2,6 +2,7 @@ > // Copyright (C) 2018 Intel Corporation > > #include > +#include > #include > #include > #include > @@ -68,6 +69,9 @@ > #define REG_CONFIG_MIRROR_FLIP 0x03 > #define REG_CONFIG_FLIP_TEST_PATTERN 0x02 > > +/* Input clock frequency in Hz */ > +#define IMX258_INPUT_CLOCK_FREQ 19200000 > + > struct imx258_reg { > u16 address; > u8 val; > @@ -610,6 +614,8 @@ struct imx258 { > > /* Streaming on/off */ > bool streaming; > + > + struct clk *clk; > }; > > static inline struct imx258 *to_imx258(struct v4l2_subdev *_sd) > @@ -972,6 +978,29 @@ static int imx258_stop_streaming(struct imx258 *imx258) > return 0; > } > > +static int imx258_power_on(struct device *dev) > +{ > + struct v4l2_subdev *sd = dev_get_drvdata(dev); > + struct imx258 *imx258 = to_imx258(sd); > + int ret; > + > + ret = clk_prepare_enable(imx258->clk); > + if (ret) > + dev_err(dev, "failed to enable clock\n"); > + > + return ret; > +} > + > +static int imx258_power_off(struct device *dev) > +{ > + struct v4l2_subdev *sd = dev_get_drvdata(dev); > + struct imx258 *imx258 = to_imx258(sd); > + > + clk_disable_unprepare(imx258->clk); > + > + return 0; > +} > + > static int imx258_set_stream(struct v4l2_subdev *sd, int enable) > { > struct imx258 *imx258 = to_imx258(sd); > @@ -1199,9 +1228,28 @@ static int imx258_probe(struct i2c_client *client) > int ret; > u32 val = 0; > > - device_property_read_u32(&client->dev, "clock-frequency", &val); > - if (val != 19200000) > - return -EINVAL; > + imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); > + if (!imx258) > + return -ENOMEM; > + > + imx258->clk = devm_clk_get_optional(&client->dev, NULL); > + if (!imx258->clk) { > + dev_dbg(&client->dev, > + "no clock provided, using clock-frequency property\n"); > + > + device_property_read_u32(&client->dev, "clock-frequency", &val); > + if (val != IMX258_INPUT_CLOCK_FREQ) > + return -EINVAL; > + } else if (IS_ERR(imx258->clk)) { > + return dev_err_probe(&client->dev, PTR_ERR(imx258->clk), > + "error getting clock\n"); > + } else { > + if (clk_get_rate(imx258->clk) != IMX258_INPUT_CLOCK_FREQ) { > + dev_err(&client->dev, > + "input clock frequency not supported\n"); > + return -EINVAL; > + } > + } > > /* > * Check that the device is mounted upside down. The driver only > @@ -1211,24 +1259,25 @@ static int imx258_probe(struct i2c_client *client) > if (ret || val != 180) > return -EINVAL; > > - imx258 = devm_kzalloc(&client->dev, sizeof(*imx258), GFP_KERNEL); > - if (!imx258) > - return -ENOMEM; > - > /* Initialize subdev */ > v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops); > > + /* Will be powered off via pm_runtime_idle */ > + ret = imx258_power_on(&client->dev); > + if (ret) > + return ret; > + > /* Check module identity */ > ret = imx258_identify_module(imx258); > if (ret) > - return ret; > + goto error_identify; > > /* Set default mode to max resolution */ > imx258->cur_mode = &supported_modes[0]; > > ret = imx258_init_controls(imx258); > if (ret) > - return ret; > + goto error_identify; > > /* Initialize subdev */ > imx258->sd.internal_ops = &imx258_internal_ops; > @@ -1258,6 +1307,9 @@ static int imx258_probe(struct i2c_client *client) > error_handler_free: > imx258_free_controls(imx258); > > +error_identify: > + imx258_power_off(&client->dev); You'll need this in remove callback, too. > + > return ret; > } > > @@ -1278,6 +1330,7 @@ static int imx258_remove(struct i2c_client *client) > > static const struct dev_pm_ops imx258_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(imx258_suspend, imx258_resume) > + SET_RUNTIME_PM_OPS(imx258_power_off, imx258_power_on, NULL) > }; > > #ifdef CONFIG_ACPI -- Kind regards, Sakari Ailus _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel