From patchwork Tue May 20 04:25:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 350495 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2AF7D14008B for ; Tue, 20 May 2014 14:28:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751795AbaETE1s (ORCPT ); Tue, 20 May 2014 00:27:48 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:35933 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751603AbaETE1r (ORCPT ); Tue, 20 May 2014 00:27:47 -0400 Received: by mail-pb0-f42.google.com with SMTP id md12so6745829pbc.1 for ; Mon, 19 May 2014 21:27:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dZMH3qb8/8Q4V6NWABggPkfVMO7S+j+jW+MdYKPCN2k=; b=hT92CqbC5BKrR36XjRv8TdLP5ckyseDvSoeizty87WhOQJpeQr0MSyg+SVHKiUTmBc 8FvN5GfP1VH2UuWMJ5ivOt3N4NLfXE481mEFMmMOmHH+65ZlsP2b4TdakLXoBFFoOvvb 2ZpsuAc4g/xjubPA4inePRA1UvMwpqIOgWW4gW3dGUqyjc0SBOgrkDSbLDQESaH+R7nv UfiePUF3EZMmb0AUwH/bIuU2i+rR+/2z9KU1QKfN5DIOmjd9cu3nR0Oc/jvsV1lMj57E 3FLEuRTfDA0Sql09HIC97hU/pyAxD5X5h6J3EG42OEntouAahxoZXv0kPOLBAxWJmj0v 7+rw== X-Gm-Message-State: ALoCoQmIE4XK5goiM3g0LVRGLFwFUFGIAMSrmjVqLMpOnSfZLj6J/2+NjOHqzOnuXEtL9IYCLir4 X-Received: by 10.66.192.73 with SMTP id he9mr47700438pac.88.1400560067202; Mon, 19 May 2014 21:27:47 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id be7sm84166626pad.9.2014.05.19.21.27.43 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 May 2014 21:27:46 -0700 (PDT) From: Tushar Behera To: alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-doc@vger.kernel.org Cc: lgirdwood@gmail.com, robh+dt@kernel.org, sbkim73@samsung.com, rdunlap@infradead.org, broonie@kernel.org, dianders@chromium.org, t.figa@samsung.com Subject: [PATCH] ASoC: samsung: Add 'mclk' handling for Snow sound-card driver Date: Tue, 20 May 2014 09:55:42 +0530 Message-Id: <1400559942-5666-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org For audio to work on Snow board, we need the codec master clock 'mclk' to be properly configured. Currently XCLKOUT is configured as 'mclk' for codec chip and it is required to be clocked at 24MHz for the codec to work properly. Add appropriate clock handling within Snow sound-card driver to set 'mclk' to operate at 24MHz. Signed-off-by: Tushar Behera --- Documentation/devicetree/bindings/sound/snow.txt | 7 ++++++ sound/soc/samsung/snow.c | 26 +++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/snow.txt b/Documentation/devicetree/bindings/sound/snow.txt index 678b191..94dd29c 100644 --- a/Documentation/devicetree/bindings/sound/snow.txt +++ b/Documentation/devicetree/bindings/sound/snow.txt @@ -7,6 +7,10 @@ Required properties: - samsung,i2s-controller: The phandle of the Samsung I2S controller - samsung,audio-codec: The phandle of the audio codec +Optional properties: +- clocks: The phandle of the master clock to audio codec +- clock-names: Should be "mclk" + Example: sound { @@ -14,4 +18,7 @@ sound { samsung,i2s-controller = <&i2s0>; samsung,audio-codec = <&max98095>; + + clocks = <&pmu_system_controller>; + clock-names = "mclk"; }; diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 014c177..c910739 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -15,13 +15,18 @@ #include #include #include +#include #include #include "i2s.h" +/* Desired clock rate for codec mclk */ #define FIN_PLL_RATE 24000000 +static struct clk *mclk; +static unsigned long mclk_rate; + static struct snd_soc_dai_link snow_dai[] = { { .name = "Primary", @@ -41,7 +46,7 @@ static int snow_late_probe(struct snd_soc_card *card) /* Set the MCLK rate for the codec */ ret = snd_soc_dai_set_sysclk(codec_dai, 0, - FIN_PLL_RATE, SND_SOC_CLOCK_IN); + mclk_rate, SND_SOC_CLOCK_IN); if (ret < 0) return ret; @@ -68,6 +73,16 @@ static int snow_probe(struct platform_device *pdev) struct device_node *i2s_node, *codec_node; int i, ret; + /* The codec MCLK should be clocked at 24MHz */ + mclk = devm_clk_get(&pdev->dev, "mclk"); + if (!IS_ERR(mclk)) { + clk_prepare_enable(mclk); + clk_set_rate(mclk, FIN_PLL_RATE); + mclk_rate = clk_get_rate(mclk); + } else { + mclk_rate = FIN_PLL_RATE; + } + i2s_node = of_parse_phandle(pdev->dev.of_node, "samsung,i2s-controller", 0); if (!i2s_node) { @@ -101,6 +116,14 @@ static int snow_probe(struct platform_device *pdev) return ret; } +static int snow_remove(struct platform_device *pdev) +{ + if (!IS_ERR(mclk)) + clk_disable_unprepare(mclk); + + return 0; +} + static const struct of_device_id snow_of_match[] = { { .compatible = "google,snow-audio-max98090", }, { .compatible = "google,snow-audio-max98095", }, @@ -115,6 +138,7 @@ static struct platform_driver snow_driver = { .of_match_table = snow_of_match, }, .probe = snow_probe, + .remove = snow_remove, }; module_platform_driver(snow_driver);