From patchwork Fri Jul 25 08:46:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 4621781 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 893939F23C for ; Fri, 25 Jul 2014 08:45:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E6AA201FE for ; Fri, 25 Jul 2014 08:45:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1F756201FA for ; Fri, 25 Jul 2014 08:45:09 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 971542619D0; Fri, 25 Jul 2014 10:45:07 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C22F62610D2; Fri, 25 Jul 2014 10:44:28 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3FCE82610A0; Fri, 25 Jul 2014 10:44:26 +0200 (CEST) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2lp0212.outbound.protection.outlook.com [207.46.163.212]) by alsa0.perex.cz (Postfix) with ESMTP id 497FF260851 for ; Fri, 25 Jul 2014 10:44:17 +0200 (CEST) Received: from BY2PR03CA051.namprd03.prod.outlook.com (10.141.249.24) by BL2PR03MB356.namprd03.prod.outlook.com (10.141.89.27) with Microsoft SMTP Server (TLS) id 15.0.990.7; Fri, 25 Jul 2014 08:44:11 +0000 Received: from BL2FFO11FD057.protection.gbl (2a01:111:f400:7c09::152) by BY2PR03CA051.outlook.office365.com (2a01:111:e400:2c5d::24) with Microsoft SMTP Server (TLS) id 15.0.995.14 via Frontend Transport; Fri, 25 Jul 2014 08:44:11 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD057.mail.protection.outlook.com (10.173.161.185) with Microsoft SMTP Server (TLS) id 15.0.980.11 via Frontend Transport; Fri, 25 Jul 2014 08:44:10 +0000 Received: from rio.ap.freescale.net (rio.ap.freescale.net [10.192.242.9]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s6P8hmDl015463; Fri, 25 Jul 2014 01:44:04 -0700 From: Nicolin Chen To: Date: Fri, 25 Jul 2014 16:46:18 +0800 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Matching-Connectors: 130507514507645398; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(48376002)(26826002)(50466002)(74662001)(104166001)(31966008)(46102001)(74502001)(19580405001)(88136002)(33646002)(77982001)(105596002)(81442001)(73392001)(19580395003)(106466001)(84676001)(104016003)(95666004)(102836001)(21056001)(85306003)(81342001)(81542001)(55446002)(76176999)(107046002)(82202001)(47776003)(77156001)(20776003)(229853001)(36756003)(85852003)(83072002)(6806004)(80022001)(110136001)(64706001)(2351001)(50986999)(92566001)(79102001)(44976005)(92726001)(97736001)(89996001)(99396002)(575784001)(61266001)(87572001)(68736004)(86362001)(93916002)(73972005)(62966002)(87286001)(50226001)(87936001)(4396001); DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB356; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02830F0362 Received-SPF: SoftFail (: domain of transitioning gmail.com discourages use of 192.88.168.50 as permitted sender) Authentication-Results: spf=softfail (sender IP is 192.88.168.50) smtp.mailfrom=nicoleotsuka@gmail.com; Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, b42378@freescale.com, timur@tabi.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, tiwai@suse.de, linux-kernel@vger.kernel.org, rdunlap@infradead.org, b02247@freescale.com, lgirdwood@gmail.com, varkabhadram@gmail.com, robh+dt@kernel.org, galak@codeaurora.org, grant.likely@linaro.org, tklauser@distanz.ch, shawn.guo@linaro.org, linuxppc-dev@lists.ozlabs.org Subject: [alsa-devel] [PATCH v5 1/2] ARM: imx: Add the secondary request into the structure for imx-sdma X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP SDMA supports device to device (per_2_per) scripts to handle DMA transfering between two peripheral devices. The per_2_per script, however, needs two dma requests from two sides while the current structure only defined one request. So this patch just simply adds the secondary request so as to let SDMA and its user to add its implementation later. [ Both change in the SDMA driver and its users like Freescale ASRC ASoC driver should be taken along with this change in order to truly support per_2_per sciprts. However, we here make an expediency by adding this first so that we can add either side later since this patch won't break any function and meanwhile it can make merge window more smoothly: we don't need to apply the change inside dmaengine branch via ASoC tree any more. -- Nicolin ] Signed-off-by: Nicolin Chen Acked-by: Shawn Guo --- include/linux/platform_data/dma-imx.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 7aa0e89..6a1357d 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -51,6 +51,7 @@ enum imx_dma_prio { struct imx_dma_data { int dma_request; /* DMA request line */ + int dma_request2; /* secondary DMA request line */ enum sdma_peripheral_type peripheral_type; int priority; };