From patchwork Tue Dec 7 22:14:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 384352 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7MHPx1029146 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 7 Dec 2010 22:17:47 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oB7MG59R026246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 7 Dec 2010 16:16:05 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id oB7MG43f029623; Tue, 7 Dec 2010 16:16:04 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 4996080636; Tue, 7 Dec 2010 16:15:41 -0600 (CST) 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 863278062F for ; Tue, 7 Dec 2010 16:15:02 -0600 (CST) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id oB7MF24f029702 for ; Tue, 7 Dec 2010 16:15:02 -0600 (CST) Received: from psmtp.com (na3sys009amx171.postini.com [74.125.149.97]) by neches.ext.ti.com (8.13.7/8.13.7) with SMTP id oB7MF10N018122 for ; Tue, 7 Dec 2010 16:15:01 -0600 Received: from source ([209.85.160.173]) by na3sys009amx171.postini.com ([74.125.148.10]) with SMTP; Tue, 07 Dec 2010 22:15:02 GMT Received: by gye5 with SMTP id 5so316954gye.4 for ; Tue, 07 Dec 2010 14:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=vv1Fo+uKUGQugPfsxbAdIjJIVK7gPV2QJUy0f64DVV8=; b=Ah7NO47bqDDo1ocB/hXAlzpx70jPbGNsO/IWRRVZRgh4CpvDjivSxL7zgHL03FaSG6 4DkTzH2YIcNcEQE7q8C2xanzAqztlm/omDViOIELJJOeRqB34fGxnDnzkkPA4RXj3sPE K0i6ApWVfTeanNcxsGu2xBqE16wgIvoWyI7Uk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=PoAoy5bB4YDo7YV+jTga3XWEtXqCAt4td6uhomfmib3Eex6KBPX6/yPC2ltaov0gdc Q/mCuBvgFLhOtRFvQWRQJzUzy/Tq1T2Vib3tMyFJ+Ao1D/1+Gv+QXdYSyVPpGQAFiqaW habAM8bC22NLemBkHELwJq5vy0HaWTdI2B5RU= Received: by 10.100.91.16 with SMTP id o16mr3719336anb.121.1291760101198; Tue, 07 Dec 2010 14:15:01 -0800 (PST) Received: from localhost.localdomain ([200.52.114.70]) by mx.google.com with ESMTPS id b28sm7113634ana.28.2010.12.07.14.14.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Dec 2010 14:15:00 -0800 (PST) From: To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH v10 2/6] davinci: EDMA support for Omapl138-Hawkboard Date: Tue, 7 Dec 2010 16:14:45 -0600 Message-Id: <1291760089-5818-3-git-send-email-vm.rod25@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291760089-5818-1-git-send-email-vm.rod25@gmail.com> References: <1291760089-5818-1-git-send-email-vm.rod25@gmail.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:67.69015/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.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: Russell King , Victor Rodriguez , 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: , MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Dec 2010 22:17:47 +0000 (UTC) diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 75b3fe2..cefff9b 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -60,6 +60,55 @@ static __init void omapl138_hawk_config_emac(void) __func__, ret); } +/* + * The following EDMA channels/slots are not being used by drivers (for + * example: Timer, GPIO, UART events etc) on da850/omap-l138 EVM/Hawkboard, + * hence they are being reserved for codecs on the DSP side. + */ +static const s16 da850_dma0_rsv_chans[][2] = { + /* (offset, number) */ + { 8, 6}, + {24, 4}, + {30, 2}, + {-1, -1} +}; + +static const s16 da850_dma0_rsv_slots[][2] = { + /* (offset, number) */ + { 8, 6}, + {24, 4}, + {30, 50}, + {-1, -1} +}; + +static const s16 da850_dma1_rsv_chans[][2] = { + /* (offset, number) */ + { 0, 28}, + {30, 2}, + {-1, -1} +}; + +static const s16 da850_dma1_rsv_slots[][2] = { + /* (offset, number) */ + { 0, 28}, + {30, 90}, + {-1, -1} +}; + +static struct edma_rsv_info da850_edma_cc0_rsv = { + .rsv_chans = da850_dma0_rsv_chans, + .rsv_slots = da850_dma0_rsv_slots, +}; + +static struct edma_rsv_info da850_edma_cc1_rsv = { + .rsv_chans = da850_dma1_rsv_chans, + .rsv_slots = da850_dma1_rsv_slots, +}; + +static struct edma_rsv_info *da850_edma_rsv[2] = { + &da850_edma_cc0_rsv, + &da850_edma_cc1_rsv, +}; static struct davinci_uart_config omapl138_hawk_uart_config __initdata = { .enabled_uarts = 0x7, @@ -73,6 +122,11 @@ static __init void omapl138_hawk_init(void) omapl138_hawk_config_emac(); + ret = da850_register_edma(da850_edma_rsv); + if (ret) + pr_warning("%s: EDMA registration failed: %d\n", + __func__, ret); + ret = da8xx_register_watchdog(); if (ret) pr_warning("omapl138_hawk_init: "