From patchwork Mon Jul 13 16:49:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 35397 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6DGpVAs022618 for ; Mon, 13 Jul 2009 16:51:32 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6DGnQDw024740; Mon, 13 Jul 2009 11:49:31 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6DGnPwW020215; Mon, 13 Jul 2009 11:49:25 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id DA5E180627; Mon, 13 Jul 2009 11:49:24 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id AAE2580626 for ; Mon, 13 Jul 2009 11:49:22 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6DGnMXp028738 for ; Mon, 13 Jul 2009 11:49:22 -0500 (CDT) Received: from mail135-va3-R.bigfish.com (mail-va3.bigfish.com [216.32.180.113]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6DGnHR3010042 for ; Mon, 13 Jul 2009 11:49:22 -0500 Received: from mail135-va3 (localhost.localdomain [127.0.0.1]) by mail135-va3-R.bigfish.com (Postfix) with ESMTP id 1448E1720100 for ; Mon, 13 Jul 2009 16:49:17 +0000 (UTC) X-SpamScore: -20 X-BigFish: vps-20(zzdf9M1432R1805Mzz1202hzzz2dh6bh61h) X-Spam-TCS-SCL: 0:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.196; Service: EHS Received: by mail135-va3 (MessageSwitch) id 1247503755278946_14645; Mon, 13 Jul 2009 16:49:15 +0000 (UCT) Received: from mail-pz0-f196.google.com (mail-pz0-f196.google.com [209.85.222.196]) by mail135-va3.bigfish.com (Postfix) with ESMTP id F03E4AF805C for ; Mon, 13 Jul 2009 16:49:14 +0000 (UTC) Received: by pzk34 with SMTP id 34so530121pzk.4 for ; Mon, 13 Jul 2009 09:49:14 -0700 (PDT) Received: by 10.142.49.4 with SMTP id w4mr1294396wfw.127.1247503752324; Mon, 13 Jul 2009 09:49:12 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 29sm9294911wfg.39.2009.07.13.09.49.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 13 Jul 2009 09:49:11 -0700 (PDT) To: "Narnakaje, Snehaprabha" References: <4A579AE6.2030606@boundarydevices.com> <7A436F7769CA33409C6B44B358BFFF0C011E512E3F@dlee02.ent.ti.com> <7A436F7769CA33409C6B44B358BFFF0C011E513480@dlee02.ent.ti.com> <87zlb8h91r.fsf@deeprootsystems.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Mon, 13 Jul 2009 09:49:10 -0700 In-Reply-To: <87zlb8h91r.fsf@deeprootsystems.com> (Kevin Hilman's message of "Mon\, 13 Jul 2009 08\:55\:28 -0700") Message-ID: <87eiskh6k9.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Cc: "davinci-linux-open-source@linux.davincidsp.com" , Mark Brown , "linux-arm-kernel@lists.arm.linux.org.uk" , "Medisetty, Naresh" Subject: Re: [PATCH 07/26] davinci: dm646x: Adds McASP clock X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com Kevin Hilman writes: > "Narnakaje, Snehaprabha" writes: > >> Did you happen to test Audio on DM6446 with the latest on linux-davinci tree? >> >> For the same clock name issue Arun is running into on DM355, the codecs are not getting detected on DM6446. >> >> Advanced Linux Sound Architecture Driver Version 1.0.20. >> No device for DAI tlv320aic3x >> No device for DAI davinci-i2s >> ALSA device list: >> No soundcards found. >> >> I am thinking we are seeing these issues due to the way dm355 (or dm6446) clocks are defined on linux-davinci tree and the mach-davinci on kernel.org. >> >>>From arch/arm/mach-davinci/dm355.c of kernel.org >> CLK("soc-audio.0", NULL, &asp0_clk), >> CLK("soc-audio.1", NULL, &asp1_clk), >> >> And from arch/arm/mach-davinci/dm355.c of linux-davinci tree >> CLK(NULL, "asp0", &asp0_clk), >> CLK(NULL, "asp1", &asp1_clk), >> >> Kevin, any comments? > > Yes, ASoC drivers are headed upstream and there's currently a mismatch > between the patches that are going upstream via linux-davinci and those > going upstream via the ASoC tree. > > linux-davinci is missing some of the changes that are queued up in > Mark Brown's for-2.6.32 branch, namely the change that addes > the name argument to clk_get(). > > On linux-davinci, if you switch back to this form of CLK definition: > > CLK("soc-audio.0", NULL, &asp0_clk), > CLK("soc-audio.1", NULL, &asp1_clk), > > does it work for you again? OK, I confirmed that this proposed change results in working audio on dm6446. So I tried to merge Mark's for-2.6.32 branch with davinci master, and it doesn't compile using 'davinci_all_defconfig' because the spdif codec doesn't support drivers built as modules, nor does it build as as a module. To support drivers built as modules, I needed patch[1] below, and to get the spdif codec to work as a module it needs a GPL licence so it can get to platform_[un]register_driver()[2] With these two patches, Mark's for-2.6.32 branch merged into DaVinci git master is working for me on dm6446. I've pushed this to the branch 'temp/asoc' of DaVinci git for others to test on other platforms. Kevin [1] commit 1c3d901bd47f4a55b79280ee64aa738ff1718263 Author: Kevin Hilman Date: Mon Jul 13 09:33:11 2009 -0700 ASoC: spdif codec: enable use by modules diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c index 218b33a..9b18fbf 100644 --- a/sound/soc/codecs/spdif_transciever.c +++ b/sound/soc/codecs/spdif_transciever.c @@ -34,6 +34,7 @@ struct snd_soc_dai dit_stub_dai = { .formats = STUB_FORMATS, }, }; +EXPORT_SYMBOL(dit_stub_dai); static int spdif_dit_probe(struct platform_device *pdev) { [2] commit 2d62a2f3db0e86f830adb68ab49b01c2c5979556 Author: Kevin Hilman Date: Mon Jul 13 09:40:56 2009 -0700 temp: hack diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c index 9b18fbf..c4431a9 100644 --- a/sound/soc/codecs/spdif_transciever.c +++ b/sound/soc/codecs/spdif_transciever.c @@ -21,6 +21,8 @@ #include "spdif_transciever.h" +MODULE_LICENSE("GPL"); + #define STUB_RATES SNDRV_PCM_RATE_8000_96000 #define STUB_FORMATS SNDRV_PCM_FMTBIT_S16_LE