From patchwork Thu Oct 11 21:33:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1584281 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by patchwork1.kernel.org (Postfix) with ESMTP id 6B9AE3FD9C for ; Thu, 11 Oct 2012 21:34:49 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id q9BLX3qo026744; Thu, 11 Oct 2012 16:33:03 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9BLX3qd029389; Thu, 11 Oct 2012 16:33:03 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Thu, 11 Oct 2012 16:33:03 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9BLX3I7005172; Thu, 11 Oct 2012 16:33:03 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 5BC7680626; Thu, 11 Oct 2012 16:33:02 -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 D87038062A for ; Thu, 11 Oct 2012 16:32:59 -0500 (CDT) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id q9BLWxYS025316 for ; Thu, 11 Oct 2012 16:32:59 -0500 (CDT) Received: from psmtp.com (na3sys009amx192.postini.com [74.125.149.173]) by neches.ext.ti.com (8.13.7/8.13.7) with SMTP id q9BLWwrs030819 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 11 Oct 2012 16:32:59 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]) (using TLSv1) by na3sys009amx192.postini.com ([74.125.148.10]) with SMTP; Thu, 11 Oct 2012 14:32:59 PDT Received: by mail-ie0-f173.google.com with SMTP id 17so3737105iea.4 for ; Thu, 11 Oct 2012 14:32:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=WVfiSdNyzsSk3U+T3iOoDmBxwJvi0zbHmt4Ql5WF7+M=; b=VdYOlv1UBiSFU6qOl/dyk+04YlToE9pnmNKQCnCsxt1b2lT16zCNQIavZPmFf88yLy 08KOHrYNAH/1UhTZD1Sz7G/jnw7OPDY2w3RzU5TtdO8ZVe+4IJR4vRUOppfl52WQK/E2 nieuKk3uapL01o9YzWwYtvybVkLZtDzNX6Z+TGtFmaegxvxrjgC01zXkOwdjpzieW321 iGIFOGqBlkrWU3qzz/O7wBJZZGG3mymlZg8fnJ/T/WbdZ+0p88v4VmHk77ATcIo6v5RF 0jw6OYxVLwSLzGuiY4LXV6Pqv40cxfScHD3nK1HU4lGZTVsBUKsjUqcd5Of8KmgtTaqO Oeeg== Received: by 10.50.33.232 with SMTP id u8mr361588igi.39.1349991178503; Thu, 11 Oct 2012 14:32:58 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id uj6sm353966igb.4.2012.10.11.14.32.56 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 14:32:57 -0700 (PDT) From: Matt Porter To: Mark Brown , , Sekhar Nori Subject: [PATCH v2 2/2] ARM: davinci: enable SRAM ping ping buffering on DA850 Date: Thu, 11 Oct 2012 17:33:49 -0400 Message-ID: <1349991229-32107-3-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349991229-32107-1-git-send-email-mporter@ti.com> References: <1349991229-32107-1-git-send-email-mporter@ti.com> X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:66.34552/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-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: Linux DaVinci Kernel List , Alsa Devel List , Linux Kernel Mailing List , Daniel Mack 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: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com Passes the DA850 shared SRAM gen_pool to the McASP driver and enables the ping-pong buffer DMA support. Signed-off-by: Matt Porter --- arch/arm/mach-davinci/board-da850-evm.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 9e7f954..df87866 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -749,16 +750,19 @@ static u8 da850_iis_serializer_direction[] = { }; static struct snd_platform_data da850_evm_snd_data = { - .tx_dma_offset = 0x2000, - .rx_dma_offset = 0x2000, - .op_mode = DAVINCI_MCASP_IIS_MODE, - .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), - .tdm_slots = 2, - .serial_dir = da850_iis_serializer_direction, - .asp_chan_q = EVENTQ_0, - .version = MCASP_VERSION_2, - .txnumevt = 1, - .rxnumevt = 1, + .tx_dma_offset = 0x2000, + .rx_dma_offset = 0x2000, + .op_mode = DAVINCI_MCASP_IIS_MODE, + .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), + .tdm_slots = 2, + .serial_dir = da850_iis_serializer_direction, + .asp_chan_q = EVENTQ_0, + .ram_chan_q = EVENTQ_1, + .version = MCASP_VERSION_2, + .txnumevt = 1, + .rxnumevt = 1, + .sram_size_playback = SZ_8K, + .sram_size_capture = SZ_8K, }; static const short da850_evm_mcasp_pins[] __initconst = { @@ -1333,6 +1337,7 @@ static __init void da850_evm_init(void) pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", ret); + da850_evm_snd_data.sram_pool = sram_get_gen_pool(); da8xx_register_mcasp(0, &da850_evm_snd_data); ret = davinci_cfg_reg_list(da850_lcdcntl_pins);