From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932438AbaCQJse (ORCPT ); Mon, 17 Mar 2014 05:48:34 -0400 Received: from newsmtp5.atmel.com ([204.2.163.5]:2975 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756371AbaCQJsd (ORCPT ); Mon, 17 Mar 2014 05:48:33 -0400 From: Bo Shen To: Mark Brown , nicolas.ferre@atmel.com Cc: Boris BREZILLON , Bo Shen , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , Linus Walleij , Wolfram Sang , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] ASoC: atmel: support CCF based clks Date: Mon, 17 Mar 2014 17:45:39 +0800 Message-Id: <1395049541-28128-7-git-send-email-voice.shen@atmel.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1395049541-28128-1-git-send-email-voice.shen@atmel.com> References: <1395049541-28128-1-git-send-email-voice.shen@atmel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 for a specific rate: remove the clk32k clk retrieval if we're using these clks. 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_wm8904.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 platform_device *pdev) return ret; } - mclk = clk_get(NULL, "pck0"); + mclk = devm_clk_get(&pdev->dev, "pck0"); if (IS_ERR(mclk)) { dev_err(&pdev->dev, "failed to get pck0\n"); ret = PTR_ERR(mclk); goto err_set_audio; } - clk_src = clk_get(NULL, "clk32k"); - if (IS_ERR(clk_src)) { - dev_err(&pdev->dev, "failed to get clk32k\n"); - ret = PTR_ERR(clk_src); - goto err_set_audio; - } + if (!IS_ENABLED(CONFIG_COMMON_CLK)) { + clk_src = devm_clk_get(&pdev->dev, "clk32k"); + if (IS_ERR(clk_src)) { + dev_err(&pdev->dev, "failed to get clk32k\n"); + ret = PTR_ERR(clk_src); + goto err_set_audio; + } - ret = clk_set_parent(mclk, clk_src); - clk_put(clk_src); - if (ret != 0) { - dev_err(&pdev->dev, "failed to set MCLK parent\n"); - goto err_set_audio; + ret = clk_set_parent(mclk, clk_src); + if (ret != 0) { + dev_err(&pdev->dev, "failed to set MCLK parent\n"); + goto err_set_audio; + } } dev_info(&pdev->dev, "setting pck0 to %dHz\n", MCLK_RATE); -- 1.8.5.2