From patchwork Thu Mar 23 12:01:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 742640 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vplZL1npGz9s2x for ; Thu, 23 Mar 2017 23:03:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u2F2mPWL"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vplZL0pfFzDqb6 for ; Thu, 23 Mar 2017 23:03:38 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u2F2mPWL"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vplXp3sKWzDq5g for ; Thu, 23 Mar 2017 23:02:18 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u2F2mPWL"; dkim-atps=neutral Received: by mail-wm0-x243.google.com with SMTP id n11so16118873wma.0 for ; Thu, 23 Mar 2017 05:02:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3VFQ5k9tWzTgQqSUFPVFTmGj+UXsKcxNRrU2bgtyvcs=; b=u2F2mPWLiAZp9tjUxTFxQYC+QfxuzCVq+yB7jPBRH9ga2hLD9W4Lsc19PFvy4sxM9W bMWSQt0ctwlZ88p34YVsR8nLaN909Q3NbvjiFNjTY2uN4uIMoZivzy5xFt4CefC1O4cG 12ZvaW/0KeAjvMbUrNW1bL/FtsHx6hhK75UOQmF1B1pptuKEVW9wA1m2yQEEpMfBTJdQ NuZGqeIXh489ZY4R2LO+LssmmKQKzB+ISk7Y1gA+8dqE4au5hRQaO17zOyk2Q6PoM/J/ m716k1KQ4D3RNwbl+R6FWyjEItQjOHVEXEsEVSOATfS207euLIRtT26LaiWZr3WSnXGa sO8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3VFQ5k9tWzTgQqSUFPVFTmGj+UXsKcxNRrU2bgtyvcs=; b=dHc/0TIVREkQXBzsrvT3zLksoBNRUrTTqJrxao6OStNAuSvHXyEwnThBFXl6Zl0NhH OkjVi9Z3VgdE6vhA+RNWs+FX5nmyhkJ3AT39uIsCH949vULmfe2JRPIk7LLMC6v9R9vt /mJU1nBfcc6a7jYtdQLEslB79hgOhvraZHClYDaf22M0/hFA0HEUolVCP+2mHxYk33+O p5gajuuA4IsDNua0BvIlASqhXexWwkbn5GbyOh4MrDnHliQ439mmq0TIguBDvtmkyHF2 d3coBYLR83d/GJhHMVA7ExR44mLIbNYosKX8xG5/KmMxtGTjDO5eMi/fjkYAx3lrDXni NP0Q== X-Gm-Message-State: AFeK/H34vcbmOf9hBMjfc301UBZQ7ZRuWoR29HZGZxhCMiYUZbO96t9Yzj/guFhU3Y6YMQ== X-Received: by 10.28.216.141 with SMTP id p135mr13189586wmg.71.1490270535366; Thu, 23 Mar 2017 05:02:15 -0700 (PDT) Received: from oreo.local ([188.25.26.143]) by smtp.gmail.com with ESMTPSA id m80sm4035008wmi.34.2017.03.23.05.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Mar 2017 05:02:14 -0700 (PDT) From: Daniel Baluta To: timur@tabi.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, fabio.estevam@nxp.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com Subject: [PATCH] ASoC: WM8962: Let codec driver enable/disable its MCLK Date: Thu, 23 Mar 2017 14:01:50 +0200 Message-Id: <1490270510-17061-1-git-send-email-daniel.baluta@gmail.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, shengjiu.wang@nxp.com, Nicolin Chen , linux-kernel@vger.kernel.org, viorel.suman@nxp.com, mihai.serban@nxp.com, daniel.baluta@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Nicolin Chen WM8962 needs its MCLK when powerup in wm8962_resume(). Thus it's better to control the MCLK in codec driver. Thus remove the clock enable in machine dirver accordingly. While at it, get rid of imx_wm8962_remove function since it is now empty. Signed-off-by: Nicolin Chen Signed-off-by: Daniel Baluta --- sound/soc/fsl/imx-wm8962.c | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 1b60958..3d894d9 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -33,7 +33,6 @@ struct imx_wm8962_data { struct snd_soc_card card; char codec_dai_name[DAI_NAME_SIZE]; char platform_name[DAI_NAME_SIZE]; - struct clk *codec_clk; unsigned int clk_frequency; }; @@ -163,6 +162,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) struct imx_priv *priv = &card_priv; struct i2c_client *codec_dev; struct imx_wm8962_data *data; + struct clk *codec_clk; int int_port, ext_port; int ret; @@ -231,19 +231,14 @@ static int imx_wm8962_probe(struct platform_device *pdev) goto fail; } - data->codec_clk = devm_clk_get(&codec_dev->dev, NULL); - if (IS_ERR(data->codec_clk)) { - ret = PTR_ERR(data->codec_clk); + codec_clk = devm_clk_get(&codec_dev->dev, NULL); + if (IS_ERR(codec_clk)) { + ret = PTR_ERR(codec_clk); dev_err(&codec_dev->dev, "failed to get codec clk: %d\n", ret); goto fail; } - data->clk_frequency = clk_get_rate(data->codec_clk); - ret = clk_prepare_enable(data->codec_clk); - if (ret) { - dev_err(&codec_dev->dev, "failed to enable codec clk: %d\n", ret); - goto fail; - } + data->clk_frequency = clk_get_rate(codec_clk); data->dai.name = "HiFi"; data->dai.stream_name = "HiFi"; @@ -258,10 +253,10 @@ static int imx_wm8962_probe(struct platform_device *pdev) data->card.dev = &pdev->dev; ret = snd_soc_of_parse_card_name(&data->card, "model"); if (ret) - goto clk_fail; + goto fail; ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing"); if (ret) - goto clk_fail; + goto fail; data->card.num_links = 1; data->card.owner = THIS_MODULE; data->card.dai_link = &data->dai; @@ -277,16 +272,9 @@ static int imx_wm8962_probe(struct platform_device *pdev) ret = devm_snd_soc_register_card(&pdev->dev, &data->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); - goto clk_fail; + goto fail; } - of_node_put(ssi_np); - of_node_put(codec_np); - - return 0; - -clk_fail: - clk_disable_unprepare(data->codec_clk); fail: of_node_put(ssi_np); of_node_put(codec_np); @@ -294,17 +282,6 @@ static int imx_wm8962_probe(struct platform_device *pdev) return ret; } -static int imx_wm8962_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card); - - if (!IS_ERR(data->codec_clk)) - clk_disable_unprepare(data->codec_clk); - - return 0; -} - static const struct of_device_id imx_wm8962_dt_ids[] = { { .compatible = "fsl,imx-audio-wm8962", }, { /* sentinel */ } @@ -318,7 +295,6 @@ static struct platform_driver imx_wm8962_driver = { .of_match_table = imx_wm8962_dt_ids, }, .probe = imx_wm8962_probe, - .remove = imx_wm8962_remove, }; module_platform_driver(imx_wm8962_driver);