From patchwork Tue Jan 18 04:40:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rajashekhara, Sudhakar" X-Patchwork-Id: 485321 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0I4edfw025256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Jan 2011 04:41:01 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p0I4ecF3019424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 17 Jan 2011 22:40:38 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id p0I4ebh7014180 for ; Mon, 17 Jan 2011 22:40:38 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 53DAF8062B for ; Mon, 17 Jan 2011 22:40:35 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by linux.omap.com (Postfix) with ESMTP id 003BD80626 for ; Mon, 17 Jan 2011 22:40:28 -0600 (CST) Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p0I4ePnB024081; Tue, 18 Jan 2011 10:10:26 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Tue, 18 Jan 2011 10:10:25 +0530 From: "Rajashekhara, Sudhakar" To: "alsa-devel@alsa-project.org" , "davinci-linux-open-source@linux.davincidsp.com" Date: Tue, 18 Jan 2011 10:10:12 +0530 Subject: RE: [PATCH 0/5] davinci: da850: clean up pinmux arrays in da850.c Thread-Topic: [PATCH 0/5] davinci: da850: clean up pinmux arrays in da850.c Thread-Index: AcuubRAm3/ixV8LcTpqdqz85KBjpxAIRepYgAATsrDA= Message-ID: References: <1294406333-30054-1-git-send-email-michael.williamson@criticallink.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-cr-hashedpuzzle: BEWX Dj9u HI56 KTVQ M6Px NO55 Rdpl U0y9 YKOm YjtL cMV0 dOBg h4F4 jtWM luin nl5i; 5; YQBsAHMAYQAtAGQAZQB2AGUAbABAAGEAbABzAGEALQBwAHIAbwBqAGUAYwB0AC4AbwByAGcAOwBkAGEAdgBpAG4AYwBpAC0AbABpAG4AdQB4AC0AbwBwAGUAbgAtAHMAbwB1AHIAYwBlAEAAbABpAG4AdQB4AC4AZABhAHYAaQBuAGMAaQBkAHMAcAAuAGMAbwBtADsAawBoAGkAbABtAGEAbgBAAGQAZQBlAHAAcgBvAG8AdABzAHkAcwB0AGUAbQBzAC4AYwBvAG0AOwBsAGkAbgB1AHgALQBhAHIAbQAtAGsAZQByAG4AZQBsAEAAbABpAHMAdABzAC4AaQBuAGYAcgBhAGQAZQBhAGQALgBvAHIAZwA7AG0AaQBjAGgAYQBlAGwALgB3AGkAbABsAGkAYQBtAHMAbwBuAEAAYwByAGkAdABpAGMAYQBsAGwAaQBuAGsALgBjAG8AbQA=; Sosha1_v1; 7; {09370DC4-0647-4DC1-9294-2F8AD86FB9AB}; cwB1AGQAaABhAGsAYQByAC4AcgBhAGoAQAB0AGkALgBjAG8AbQA=; Tue, 18 Jan 2011 04:40:12 GMT; UgBFADoAIABbAFAAQQBUAEMASAAgADAALwA1AF0AIABkAGEAdgBpAG4AYwBpADoAIABkAGEAOAA1ADAAOgAgAGMAbABlAGEAbgAgAHUAcAAgAHAAaQBuAG0AdQB4ACAAYQByAHIAYQB5AHMAIABpAG4AIABkAGEAOAA1ADAALgBjAA== x-cr-puzzleid: {09370DC4-0647-4DC1-9294-2F8AD86FB9AB} acceptlanguage: en-US MIME-Version: 1.0 Cc: "khilman@deeprootsystems.com" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 18 Jan 2011 04:41:01 +0000 (UTC) diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 9eec630..17c0dbc 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -473,6 +473,11 @@ static struct resource da850_mcasp_resources[] = { }, }; +struct platform_device davinci_pcm_device = { + .name = "davinci-pcm-audio", + .id = -1, +}; + static struct platform_device da850_mcasp_device = { .name = "davinci-mcasp", .id = 0, @@ -480,8 +485,15 @@ static struct platform_device da850_mcasp_device = { .resource = da850_mcasp_resources, }; +static void davinci_init_pcm(void) +{ + platform_device_register(&davinci_pcm_device); +} + void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata) { + davinci_init_pcm(); + /* DA830/OMAP-L137 has 3 instances of McASP */ if (cpu_is_davinci_da830() && id == 1) { da830_mcasp1_device.dev.platform_data = pdata; diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index bc9e6b0..07db881 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -224,7 +224,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = { .stream_name = "AIC3X", .cpu_dai_name= "davinci-mcasp.0", .codec_dai_name = "tlv320aic3x-hifi", - .codec_name = "tlv320aic3x-codec.0-001a", + .codec_name = "tlv320aic3x-codec.1-0018", .platform_name = "davinci-pcm-audio", .init = evm_aic3x_init, .ops = &evm_ops,