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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 259A5C433EF for ; Wed, 9 Feb 2022 10:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233792AbiBIKQu (ORCPT ); Wed, 9 Feb 2022 05:16:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbiBIKQj (ORCPT ); Wed, 9 Feb 2022 05:16:39 -0500 Received: from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com [64.147.123.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8C19E030190; Wed, 9 Feb 2022 02:13:07 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 704612B00075; Wed, 9 Feb 2022 04:22:06 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 09 Feb 2022 04:22:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; bh=Tt9nwg4OqINVHPZtGpaWXspgVtdYpxJW0WuyZY KSUXo=; b=CES+aAc/6AFtcfKBU4TR98AXkRc06kaWv959B8647awn98r+JTV1qX xk57tVNqopfs2On7z7mip7717bEci13Ho6pAwwjQAGQoX0Fabg/FWpw0tfmsbRhm ZNjKfAt5DX1pe5AnetTRzhRXBYTPBYgqALvQnH/Qu44iREfl5Gt9FPKHzBo3Ftso rq6GEYq8FLTwdx927Z1pr5pmoZDlAs9Y7cBx+IO8pptePKKwKpaXXPGOGEvrtKGr mv2e8HaFoOCA5k/6rR4RQIW2H3ahWizzf6INCDipbDtB/m6B7D/99NSiFy/F8e+0 ApL3vZfXZDAGbeCEzOzBRsUEKU26xLMQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Tt9nwg4OqINVHPZtG paWXspgVtdYpxJW0WuyZYKSUXo=; b=DNgujOG3Kyu87VeORY/tXh7zV2FEaRCD2 jHTYL32LjpGyCvlGrXljVxM0tT3qSfElSiMBYhhypG3dxP7obOe+HKXcltlN33Da NzJY0Rrn85+jeDIxl9miv53hhpkUbs4BZwJ0Boxmo9ip8UHHBTuywmdmUU7SHvkH FuLnmbAFtgN4b/TDRMKRpz5Bq58NyFH4tHrhyW56fKcJtEmf8fMM2ySratv+hfRc jFO//p7Kioly4TPiiWzuu54aJdiG6Pf9VSnmpG/fJDInw1VfN73Otf0Dx3Zx0cP+ ufsQu/5K1dHYWmUGZX/HJehFuYjIw94LVU2wDPIR+lijQ86k4/ZQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrheelgddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpeelkeeghefhuddtleejgfeljeffheffgfeijefhgfeufefhtdevteegheeiheeg udenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 9 Feb 2022 04:22:04 -0500 (EST) Date: Wed, 9 Feb 2022 10:22:03 +0100 From: Maxime Ripard To: Paul Kocialkowski Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-phy@lists.infradead.org, linux-clk@vger.kernel.org, linux-staging@lists.linux.dev, Yong Deng , Mauro Carvalho Chehab , Rob Herring , Sakari Ailus , Hans Verkuil , Chen-Yu Tsai , Jernej Skrabec , Greg Kroah-Hartman , Helen Koike , Laurent Pinchart , Thomas Petazzoni Subject: Re: [PATCH v2 22/66] media: sun6i-csi: Use runtime pm for clocks and reset Message-ID: <20220209092203.3fieqs4mbip6heug@houat> References: <20220205185429.2278860-1-paul.kocialkowski@bootlin.com> <20220205185429.2278860-23-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="rqnlvhzt36vdmgbb" Content-Disposition: inline In-Reply-To: <20220205185429.2278860-23-paul.kocialkowski@bootlin.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --rqnlvhzt36vdmgbb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 05, 2022 at 07:53:45PM +0100, Paul Kocialkowski wrote: > Wrap the clock and reset preparation into runtime pm functions > for better organization of the code. >=20 > Signed-off-by: Paul Kocialkowski > --- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 94 ++++++++++++++----- > 1 file changed, 69 insertions(+), 25 deletions(-) >=20 > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers= /media/platform/sunxi/sun6i-csi/sun6i_csi.c > index 2355088fdc37..b53b92b70a89 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 *cs= i_dev, bool enable) > =20 > if (!enable) { > regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, 0); > + pm_runtime_put(dev); > =20 > - clk_disable_unprepare(csi_dev->clk_ram); > - clk_disable_unprepare(csi_dev->clk_mod); > - reset_control_assert(csi_dev->reset); > return 0; > } > =20 > - ret =3D clk_prepare_enable(csi_dev->clk_mod); > - if (ret) { > - dev_err(csi_dev->dev, "Enable csi clk err %d\n", ret); > + ret =3D pm_runtime_resume_and_get(dev); > + if (ret < 0) > return ret; > - } > - > - ret =3D clk_prepare_enable(csi_dev->clk_ram); > - if (ret) { > - dev_err(csi_dev->dev, "Enable clk_dram_csi clk err %d\n", ret); > - goto clk_mod_disable; > - } > - > - ret =3D reset_control_deassert(csi_dev->reset); > - if (ret) { > - dev_err(csi_dev->dev, "reset err %d\n", ret); > - goto clk_ram_disable; > - } > =20 > regmap_update_bits(regmap, CSI_EN_REG, CSI_EN_CSI_EN, CSI_EN_CSI_EN); > =20 > return 0; > - > -clk_ram_disable: > - clk_disable_unprepare(csi_dev->clk_ram); > -clk_mod_disable: > - clk_disable_unprepare(csi_dev->clk_mod); > - return ret; > } > =20 > static enum csi_input_fmt get_csi_input_format(struct sun6i_csi_device *= csi_dev, > @@ -800,6 +778,65 @@ static irqreturn_t sun6i_csi_isr(int irq, void *priv= ate) > return IRQ_HANDLED; > } > =20 > +static int sun6i_csi_suspend(struct device *dev) > +{ > + struct sun6i_csi_device *csi_dev =3D dev_get_drvdata(dev); > + > + reset_control_assert(csi_dev->reset); > + clk_disable_unprepare(csi_dev->clk_ram); > + clk_disable_unprepare(csi_dev->clk_mod); > + clk_disable_unprepare(csi_dev->clk_bus); > + > + return 0; > +} > + > +static int sun6i_csi_resume(struct device *dev) > +{ > + struct sun6i_csi_device *csi_dev =3D dev_get_drvdata(dev); > + int ret; > + > + ret =3D reset_control_deassert(csi_dev->reset); > + if (ret) { > + dev_err(dev, "failed to deassert reset\n"); > + return ret; > + } > + > + ret =3D clk_prepare_enable(csi_dev->clk_bus); > + if (ret) { > + dev_err(dev, "failed to enable bus clock\n"); > + goto error_reset; > + } > + > + ret =3D clk_prepare_enable(csi_dev->clk_mod); > + if (ret) { > + dev_err(dev, "failed to enable module clock\n"); > + goto error_clk_bus; > + } > + > + ret =3D clk_prepare_enable(csi_dev->clk_ram); > + if (ret) { > + dev_err(dev, "failed to enable ram clock\n"); > + goto error_clk_mod; > + } > + > + return 0; You've change the order of the reset vs clock initialization. Also, does that work with CONFIG_PM disabled? Maxime --rqnlvhzt36vdmgbb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYgOHuwAKCRDj7w1vZxhR xZriAP9bZyn3qXa36hkToZ4ZGQtpdPm8U/5vUSO5rhzQUD/N5gEA7uxX1cpy0NiA FcVH+0Ecscz+V2GzVMoJkN0yAOTwdAk= =kTBx -----END PGP SIGNATURE----- --rqnlvhzt36vdmgbb--