From patchwork Wed Apr 30 12:00:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 4093151 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9490CBFF02 for ; Wed, 30 Apr 2014 12:01:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D7970202B4 for ; Wed, 30 Apr 2014 12:01:22 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 47A9420274 for ; Wed, 30 Apr 2014 12:01:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C7046261B0A; Wed, 30 Apr 2014 14:01:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 8C3DA261A0D; Wed, 30 Apr 2014 14:01:08 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 882E3261AA4; Wed, 30 Apr 2014 14:01:07 +0200 (CEST) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by alsa0.perex.cz (Postfix) with ESMTP id AEAD2260309 for ; Wed, 30 Apr 2014 14:00:59 +0200 (CEST) Received: by mail-pa0-f53.google.com with SMTP id ld10so1840120pab.40 for ; Wed, 30 Apr 2014 05:00:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=Wy4Q9iloib74DgM8cfEuba1o4VvHB1YJwHLXOntWfss=; b=kORjqi6Mvj7Nzs7Xe6G5qEem2ScGGPeSW5NczW8mK6zqgkf+snvgdV4hW3t2Xlmi5Y bBIbYjQVABkwP6Wtrz1VfJmX70EGmV7W+opjbht7DVCu8ALGxJt8EC/G38Hi3OvI5vhL MmpeOlwAZcoZCn1dWAVmPC5s4T3dUQpmNrEjtGf3hkMX8n2mH8Zi8xMecqjzDv4+H9Cw DytAV/SH4tDdAqKFQVFXqp6wsH3pY5RA+I2j1Stiwa1f263u9ZF/KOO4Tc2j3XTBJSwc iLKV6HQBL5DAgw9txhuu4gin4y4nqyTXSD8ZZM0bN8tGohOsEnzwmkjrlA4+xQiwDZSh LYXA== X-Gm-Message-State: ALoCoQmo/fuzaXX79/5yWVvMT92yYLUFokLdkemoCGPG3eTbhRAOg9JIA46CgjSxC6VYfDeiwGvY X-Received: by 10.67.14.98 with SMTP id ff2mr7637084pad.101.1398859253249; Wed, 30 Apr 2014 05:00:53 -0700 (PDT) Received: from [10.10.10.29] ([115.113.119.130]) by mx.google.com with ESMTPSA id el14sm134364359pac.31.2014.04.30.05.00.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 30 Apr 2014 05:00:52 -0700 (PDT) Message-ID: <5360E5E7.8090807@linaro.org> Date: Wed, 30 Apr 2014 17:30:39 +0530 From: Tushar Behera User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Mark Brown References: <1398243705-31151-1-git-send-email-tushar.behera@linaro.org> <20140424133920.GA12304@sirena.org.uk> <5359E18B.60600@linaro.org> <20140429222915.GU15125@sirena.org.uk> In-Reply-To: <20140429222915.GU15125@sirena.org.uk> Cc: dianders@chromium.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-samsung-soc@vger.kernel.org, linux-doc@vger.kernel.org, sbkim73@samsung.com, rdunlap@infradead.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org Subject: Re: [alsa-devel] [PATCH V2] ASoC: SAMSUNG: Add sound card driver for Snow board X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP On 04/30/2014 03:59 AM, Mark Brown wrote: > On Fri, Apr 25, 2014 at 09:46:11AM +0530, Tushar Behera wrote: >> On 04/24/2014 07:09 PM, Mark Brown wrote: > >>> defined. Why is that? Also, why is the secondary I2S playback stream >>> not supported (this may be a reason to restrict to only the one I2S >>> interface)? > >> AFAICS, I2S driver doesn't support secondary DAI with DT (dai type is >> always TYPE_PRI in case of DT). Hence I could not find a setup to test >> secondary dai with this board. > > OK, that should be fixed at some point. I will hopefully be able to > look at this myself on the Arndale Octa though (or Chromebook or Arndale > once XCLKOUT is implemented). > XCLKOUT mux register (0x10040a00) is not part of core clock SFR range, rather it is part of pmu-system-controller node. One option would be to add a clock provider for XCLKOUT. That would require me to extend current clock driver to get the pmu-system-controller phandle which in turn is dependent on the patch to early initialize syscon driver.[1] Will it be okay to configure XCLKOUT in snow sound-card driver by taking the phandle of pmu-system-controller from device tree? The implementation is provided below. [1] article.gmane.org/gmane.linux.kernel/1679446 diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c index 0fa89a4..d7fe7a0 100644 --- a/sound/soc/samsung/snow.c +++ b/sound/soc/samsung/snow.c @@ -15,6 +15,7 @@ #include #include #include +#include #include @@ -22,6 +23,10 @@ #define FIN_PLL_RATE 24000000 +#define XCLKOUT_OFFSET 0x0a00 +#define XCLKOUT_PARENT_MASK 0x1f00 +#define XCLKOUT_PARENT_XXTI 0x1000 + static struct snd_soc_dai_link snow_dai[] = { { .name = "Primary", @@ -66,6 +71,7 @@ static int snow_probe(struct platform_device *pdev) { struct snd_soc_card *card = &snow_snd; struct device_node *i2s_node, *codec_node; + struct regmap *pmureg; int i, ret; i2s_node = of_parse_phandle(pdev->dev.of_node, @@ -84,6 +90,19 @@ static int snow_probe(struct platform_device *pdev) return -EINVAL; } + /* + * On Snow board, SoC XCLKOUT line is connected to codec MCLK. + * One option would be to add another clock provider to configure + * XCLKOUT mux register. Else we can get pmu-syscon phandle from + * device tree and update the register here. + */ + pmureg = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, + "samsung,pmu-syscon"); + if (!IS_ERR(pmureg)) { + regmap_update_bits(pmureg, XCLKOUT_OFFSET, + XCLKOUT_PARENT_MASK, XCLKOUT_PARENT_XXTI); + } + for (i = 0; i < ARRAY_SIZE(snow_dai); i++) { snow_dai[i].codec_of_node = codec_node; snow_dai[i].cpu_of_node = i2s_node;