From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754109AbaIOKcc (ORCPT ); Mon, 15 Sep 2014 06:32:32 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:56879 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753920AbaIOKcb (ORCPT ); Mon, 15 Sep 2014 06:32:31 -0400 Date: Mon, 15 Sep 2014 12:32:13 +0200 From: Markus Pargmann To: Shengjiu Wang Cc: timur@tabi.org, nicoleotsuka@gmail.com, Li.Xiubo@freescale.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.de, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH V3] ASoC: fsl_ssi: refine ipg clock usage in this module Message-ID: <20140915103213.GE8844@pengutronix.de> References: <894383e00876763f22988fc5f3f9f232f939f923.1410517971.git.shengjiu.wang@freescale.com> <20140915100541.GD8844@pengutronix.de> <20140915102224.GA23877@audiosh1> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8vCeF2GUdMpe9ZbK" Content-Disposition: inline In-Reply-To: <20140915102224.GA23877@audiosh1> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 12:26:16 up 5 days, 3:13, 61 users, load average: 0.08, 0.09, 0.12 User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --8vCeF2GUdMpe9ZbK Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 15, 2014 at 06:22:27PM +0800, Shengjiu Wang wrote: > On Mon, Sep 15, 2014 at 12:05:41PM +0200, Markus Pargmann wrote: > > On Fri, Sep 12, 2014 at 06:35:15PM +0800, Shengjiu Wang wrote: > > > Check if ipg clock is in clock-names property, then we can move the > > > ipg clock enable and disable operation to startup and shutdown, that > > > is only enable ipg clock when ssi is working and keep clock is disabl= ed > > > when ssi is in idle. > > > But when the checking is failed, remain the clock control as before. > > >=20 > > > Signed-off-by: Shengjiu Wang > > > --- > > > V3 change log: > > > update patch according Nicolin and markus's comments > > >=20 > > >=20 > > > sound/soc/fsl/fsl_ssi.c | 53 +++++++++++++++++++++++++++++++++++++= +++------- > > > 1 file changed, 45 insertions(+), 8 deletions(-) > > >=20 > > > diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c > > > index 2fc3e66..6d1dfd5 100644 > > > --- a/sound/soc/fsl/fsl_ssi.c > > > +++ b/sound/soc/fsl/fsl_ssi.c > > > @@ -169,6 +169,7 @@ struct fsl_ssi_private { > > > u8 i2s_mode; > > > bool use_dma; > > > bool use_dual_fifo; > > > + bool has_ipg_clk_name; > > > unsigned int fifo_depth; > > > struct fsl_ssi_rxtx_reg_val rxtx_reg_val; > > > =20 > > > @@ -530,6 +531,11 @@ static int fsl_ssi_startup(struct snd_pcm_substr= eam *substream, > > > struct snd_soc_pcm_runtime *rtd =3D substream->private_data; > > > struct fsl_ssi_private *ssi_private =3D > > > snd_soc_dai_get_drvdata(rtd->cpu_dai); > > > + int ret; > > > + > > > + ret =3D clk_prepare_enable(ssi_private->clk); > > > + if (ret) > > > + return ret; > > > =20 > > > /* When using dual fifo mode, it is safer to ensure an even period > > > * size. If appearing to an odd number while DMA always starts its > > > @@ -544,6 +550,21 @@ static int fsl_ssi_startup(struct snd_pcm_substr= eam *substream, > > > } > > > =20 > > > /** > > > + * fsl_ssi_shutdown: shutdown the SSI > > > + * > > > + */ > > > +static void fsl_ssi_shutdown(struct snd_pcm_substream *substream, > > > + struct snd_soc_dai *dai) > > > +{ > > > + struct snd_soc_pcm_runtime *rtd =3D substream->private_data; > > > + struct fsl_ssi_private *ssi_private =3D > > > + snd_soc_dai_get_drvdata(rtd->cpu_dai); > > > + > > > + clk_disable_unprepare(ssi_private->clk); > > > + > > > +} > > > + > > > +/** > > > * fsl_ssi_set_bclk - configure Digital Audio Interface bit clock > > > * > > > * Note: This function can be only called when using SSI as DAI mast= er > > > @@ -1043,6 +1064,7 @@ static int fsl_ssi_dai_probe(struct snd_soc_dai= *dai) > > > =20 > > > static const struct snd_soc_dai_ops fsl_ssi_dai_ops =3D { > > > .startup =3D fsl_ssi_startup, > > > + .shutdown =3D fsl_ssi_shutdown, > > > .hw_params =3D fsl_ssi_hw_params, > > > .hw_free =3D fsl_ssi_hw_free, > > > .set_fmt =3D fsl_ssi_set_dai_fmt, > > > @@ -1168,17 +1190,22 @@ static int fsl_ssi_imx_probe(struct platform_= device *pdev, > > > u32 dmas[4]; > > > int ret; > > > =20 > > > - ssi_private->clk =3D devm_clk_get(&pdev->dev, NULL); > > > + if (ssi_private->has_ipg_clk_name) > > > + ssi_private->clk =3D devm_clk_get(&pdev->dev, "ipg"); > > > + else > > > + ssi_private->clk =3D devm_clk_get(&pdev->dev, NULL); > > > if (IS_ERR(ssi_private->clk)) { > > > ret =3D PTR_ERR(ssi_private->clk); > > > dev_err(&pdev->dev, "could not get clock: %d\n", ret); > > > return ret; > > > } > > > =20 > > > - ret =3D clk_prepare_enable(ssi_private->clk); > > > - if (ret) { > > > - dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n", ret); > > > - return ret; > > > + if (!ssi_private->has_ipg_clk_name) { > > > + ret =3D clk_prepare_enable(ssi_private->clk); > > > + if (ret) { > > > + dev_err(&pdev->dev, "clk_prepare_enable failed: %d\n", ret); > > > + return ret; > > > + } > > > } > > > =20 > > > /* For those SLAVE implementations, we ingore non-baudclk cases > > > @@ -1236,8 +1263,9 @@ static int fsl_ssi_imx_probe(struct platform_de= vice *pdev, > > > return 0; > > > =20 > > > error_pcm: > > > - clk_disable_unprepare(ssi_private->clk); > > > =20 > > > + if (!ssi_private->has_ipg_clk_name) > > > + clk_disable_unprepare(ssi_private->clk); > > > return ret; > > > } > > > =20 > > > @@ -1246,7 +1274,8 @@ static void fsl_ssi_imx_clean(struct platform_d= evice *pdev, > > > { > > > if (!ssi_private->use_dma) > > > imx_pcm_fiq_exit(pdev); > > > - clk_disable_unprepare(ssi_private->clk); > > > + if (!ssi_private->has_ipg_clk_name) > > > + clk_disable_unprepare(ssi_private->clk); > > > } > > > =20 > > > static int fsl_ssi_probe(struct platform_device *pdev) > > > @@ -1321,8 +1350,16 @@ static int fsl_ssi_probe(struct platform_devic= e *pdev) > > > return -ENOMEM; > > > } > > > =20 > > > - ssi_private->regs =3D devm_regmap_init_mmio(&pdev->dev, iomem, > > > + ret =3D of_property_match_string(np, "clock-names", "ipg"); > > > + if (ret < 0) { > > > + ssi_private->has_ipg_clk_name =3D false; > > > + ssi_private->regs =3D devm_regmap_init_mmio(&pdev->dev, iomem, > > > &fsl_ssi_regconfig); > >=20 > > Sorry if I was unclear about that. My suggestion was to enable the clock > > right here: > > clk_prepare_enable(ssi_private->clk); > >=20 > > Then you can remove ssi_private->has_ipg_clk_name and all > > clk_prepare_enable() and clk_disable_unprepare() from above. Also you > > can move the devm_clk_get() into this block. > > >=20 > ipg clock not only need to be enabled when accessing register, but also= =20 > need to be enabled when ssi is working. So I add clk_enable in startup. > =20 > > It seems you really want to implement this for devicetrees where the > > "ipg" clock-name is missing, but I don't understand why? I really can't > > see any benefit of adding all these clk_prepare_enable() calls for all > > cornercases that may occure. For example the clocks for AC97 are still > > missing in this version. >=20 > When ipg clock-name is missing, I just remain the code logic as before. > So AC97 case is same as before too.=20 > When have ipg clock-name, register it to regmap for accessing register, > and enabling ipg clock in startup also is useful for AC97. >=20 > I don't understand why you think clock for AC97 is still missing? Sorry got it all wrong, monday morning tiredness perhaps ;-). The patch looks good for me at the second look. I will test it later today and give you feedback. Best regards, Markus --=20 Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | --8vCeF2GUdMpe9ZbK Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBAgAGBQJUFsAtAAoJEEpcgKtcEGQQ/eMQAK8yQeZlZDtA1vdamQXUIyUQ VGi0uknhZa9dOw90xfctss+ZT0Q6JLAZNhSAD9UlcTdzMum30hB2+3f7zj251dH/ UuVBtz5PRqcAx5RHhdeqDYz6Rz7jHXKetbi/UmA1s/WXKeRB1UCPUFNR2MMBCXtd WYGhAlPhlDxdEYV34IiJEE5c+oH6Cui0gYIjo3ByFD3dC0ubiStb3OZxW3sxXYPy HFJ5QexenfZP9M7H5gs12fwRl5nSPAlig2/w14ofyINEruT9B+GE6QUv6OAP3vQw 8APjRLg2GeqC3xJCjoOlSymjUHvWl9hFZvF2F0J/b6IZnK5diI/IsW17zT/13ruM A8m5wcbPnHRJG2F41quEdbSoSkqqRVIkVytO0XADJ+xYBxxrq69X4jyTEpHv+1QY tsD6pKqa7YRgrq9CsVaO7NjeSsvdC/hD94pGHbFPlktgG+1hqk8QvZwj5buUFYUS iqj9HUJoalnPfeFX9qVzZN2e6n6sJbnSr7uNNZgEOqZZ36q1dLg86AdeZUMdkpAB SNhemtNAzdiIHuZI1iJ6NO4goGaJWUEiwBqoMep+wJH0DTwS5oyIcXf+FRT2QP8N 1D2XmvBzs1TvpREdrbx6k/P1FeIeuSPkyzfNkGjYdgH34aoIFKy+sYOQYMrfshto YD/tXAb/b782ZntegVaU =W96K -----END PGP SIGNATURE----- --8vCeF2GUdMpe9ZbK--