From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris BREZILLON Subject: Re: [PATCH 6/8] ASoC: atmel: support CCF based clks Date: Mon, 17 Mar 2014 11:31:13 +0100 Message-ID: <5326CEF1.90109@gmail.com> References: <1395049541-28128-1-git-send-email-voice.shen@atmel.com> <1395049541-28128-7-git-send-email-voice.shen@atmel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1395049541-28128-7-git-send-email-voice.shen@atmel.com> Sender: linux-kernel-owner@vger.kernel.org To: Bo Shen , Mark Brown , nicolas.ferre@atmel.com Cc: Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Linus Walleij , Wolfram Sang , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org List-Id: alsa-devel@alsa-project.org Le 17/03/2014 10:45, Bo Shen a =E9crit : > From: Boris BREZILLON > > Provide dev to clk_get function if we're using CCF based clks. > CCF based prog clks support automatic parent selection when asking fo= r a > specific rate: remove the clk32k clk retrieval if we're using these c= lks. I would have split this patch: 1) make use of devm in the existing code 2) add CCF support > Signed-off-by: Boris BREZILLON > [voice.shen@atmel.com: switch to devm manage function] > Signed-off-by: Bo Shen > > Signed-off-by: Bo Shen > --- > > sound/soc/atmel/atmel_wm8904.c | 25 +++++++++++++------------ > 1 file changed, 13 insertions(+), 12 deletions(-) > > diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_w= m8904.c > index b4e3690..a797d33 100644 > --- a/sound/soc/atmel/atmel_wm8904.c > +++ b/sound/soc/atmel/atmel_wm8904.c > @@ -170,25 +170,26 @@ static int atmel_asoc_wm8904_probe(struct platf= orm_device *pdev) > return ret; > } > =20 > - mclk =3D clk_get(NULL, "pck0"); > + mclk =3D devm_clk_get(&pdev->dev, "pck0"); I wonder if we shouldn't change the requested clk name when using CCF. After all this is a board decision to choose which programmable clk=20 should be used. The "pck0" implies that you're always connecting programmable clk 0 to=20 the wm8904 chip. What about "pck" instead of "pck0" ? Best Regards, Boris > if (IS_ERR(mclk)) { > dev_err(&pdev->dev, "failed to get pck0\n"); > ret =3D PTR_ERR(mclk); > goto err_set_audio; > } > =20 > - clk_src =3D clk_get(NULL, "clk32k"); > - if (IS_ERR(clk_src)) { > - dev_err(&pdev->dev, "failed to get clk32k\n"); > - ret =3D PTR_ERR(clk_src); > - goto err_set_audio; > - } > + if (!IS_ENABLED(CONFIG_COMMON_CLK)) { > + clk_src =3D devm_clk_get(&pdev->dev, "clk32k"); > + if (IS_ERR(clk_src)) { > + dev_err(&pdev->dev, "failed to get clk32k\n"); > + ret =3D PTR_ERR(clk_src); > + goto err_set_audio; > + } > =20 > - ret =3D clk_set_parent(mclk, clk_src); > - clk_put(clk_src); > - if (ret !=3D 0) { > - dev_err(&pdev->dev, "failed to set MCLK parent\n"); > - goto err_set_audio; > + ret =3D clk_set_parent(mclk, clk_src); > + if (ret !=3D 0) { > + dev_err(&pdev->dev, "failed to set MCLK parent\n"); > + goto err_set_audio; > + } > } > =20 > dev_info(&pdev->dev, "setting pck0 to %dHz\n", MCLK_RATE);