From patchwork Thu Jun 3 00:18:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha Kuikka X-Patchwork-Id: 103931 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o530KlpP004701 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 Jun 2010 00:21:23 GMT Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o530IukW010136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 2 Jun 2010 19:18:56 -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 o530IsD0025741; Wed, 2 Jun 2010 19:18:55 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 9E84680627; Wed, 2 Jun 2010 19:18:54 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 83B9E80626 for ; Wed, 2 Jun 2010 19:18:53 -0500 (CDT) Received: from red.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id o530IrKK002484 for ; Wed, 2 Jun 2010 19:18:53 -0500 (CDT) Received: from psmtp.com (na3sys009amx182.postini.com [74.125.149.163]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id o530IqcA024895 for ; Wed, 2 Jun 2010 19:18:52 -0500 Received: from source ([74.125.83.45]) by na3sys009amx182.postini.com ([74.125.148.10]) with SMTP; Wed, 02 Jun 2010 17:18:52 PDT Received: by gwj20 with SMTP id 20so1180487gwj.4 for ; Wed, 02 Jun 2010 17:18:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:content-type; bh=mmIn1RX164stQWGJK1pMYs+zBvWR2yCuGfLUIGyur/A=; b=geJAqUILNnzvY+xB6P29d/TTkicWcvy1sstyT2aGZoM9mCUfRf3JwCLEjM3cWZP7CF ZiwhAAyF2MMexiHB/fgQO1mKoMiKC5EVj2F8KrRmUtJb3RIN0zaeds+iMAwAjj36wYQZ AA4zO5yYRoQij/u/Mr0B2lH6xU1J0iMz7BeKs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=oUdmlucJh4FyOlLrPX7zXPwjBz+HoTu5GRuun9l9ZvKL6YiOwGFjn4koZ7/JW+uIZz cfGTD19/U3YP2GmIx+6yVs+KliBfrupvgGpKAaAZQ4LSS2iOCFQOGGqT84wos/Zy2tXa x6+H7NCO2HlvRfhO5W3+LLdItDOUN5FdWtNR0= MIME-Version: 1.0 Received: by 10.231.79.74 with SMTP id o10mr10857652ibk.36.1275524331544; Wed, 02 Jun 2010 17:18:51 -0700 (PDT) Received: by 10.231.12.139 with HTTP; Wed, 2 Jun 2010 17:18:51 -0700 (PDT) In-Reply-To: References: Date: Wed, 2 Jun 2010 17:18:51 -0700 Message-ID: Subject: Re: DA850 and MMCSD1 EDMA From: Juha Kuikka To: davinci-linux-open-source@linux.davincidsp.com X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] 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@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 00:21:23 +0000 (UTC) --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -186,6 +186,7 @@ static struct edma_soc_info da850_edma_info[] = { .n_cc = 1, .queue_tc_mapping = da8xx_queue_tc_mapping, .queue_priority_mapping = da8xx_queue_priority_mapping, + .default_queue = EVENTQ_1, }, { .n_channel = 32, @@ -195,6 +196,7 @@ static struct edma_soc_info da850_edma_info[] = { .n_cc = 1, .queue_tc_mapping = da850_queue_tc_mapping, .queue_priority_mapping = da850_queue_priority_mapping, + .default_queue = EVENTQ_0, }, }; --- a/arch/arm/mach-davinci/dma.c +++ b/arch/arm/mach-davinci/dma.c @@ -1447,8 +1447,6 @@ static int __init edma_probe(struct platform_device *pdev) EDMA_MAX_CC); edma_info[j]->default_queue = info[j].default_queue; - if (!edma_info[j]->default_queue) - edma_info[j]->default_queue = EVENTQ_1; dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n", edmacc_regs_base[j]); @@ -1508,7 +1506,7 @@ static int __init edma_probe(struct platform_device *pdev) * started by the codec engine will not cause audio defects. */ for (i = 0; i < edma_info[j]->num_channels; i++) - map_dmach_queue(j, i, EVENTQ_1); + map_dmach_queue(j, i, edma_info[j]->default_queue); queue_tc_mapping = info[j].queue_tc_mapping; queue_priority_mapping = info[j].queue_priority_mapping;