From patchwork Fri Jun 10 09:12:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Appana Durga Kedareswara rao X-Patchwork-Id: 9169093 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7019F6048F for ; Fri, 10 Jun 2016 09:14:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AB951FFC7 for ; Fri, 10 Jun 2016 09:14:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F4EC28325; Fri, 10 Jun 2016 09:14:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C4DC1FFC7 for ; Fri, 10 Jun 2016 09:14:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBIVN-0008V5-BZ; Fri, 10 Jun 2016 09:13:29 +0000 Received: from mail-cys01nam02on0073.outbound.protection.outlook.com ([104.47.37.73] helo=NAM02-CY1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bBIV4-0008Iv-8w for linux-arm-kernel@lists.infradead.org; Fri, 10 Jun 2016 09:13:11 +0000 Received: from SN1NAM02FT023.eop-nam02.prod.protection.outlook.com (10.152.72.51) by SN1NAM02HT039.eop-nam02.prod.protection.outlook.com (10.152.73.122) with Microsoft SMTP Server (TLS) id 15.1.511.7; Fri, 10 Jun 2016 09:12:47 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT023.mail.protection.outlook.com (10.152.72.156) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Fri, 10 Jun 2016 09:12:47 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:37601 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1bBIUe-0007iH-LD; Fri, 10 Jun 2016 02:12:44 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1bBIUg-0007aO-GO; Fri, 10 Jun 2016 02:12:46 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u5A9Ce6I019567; Fri, 10 Jun 2016 02:12:41 -0700 Received: from [172.23.64.208] (helo=xhdrdevl6.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1bBIUa-0007ZJ-LR; Fri, 10 Jun 2016 02:12:40 -0700 Received: by xhdrdevl6.xilinx.com (Postfix, from userid 13614) id 5DAC6F2000F; Fri, 10 Jun 2016 14:42:39 +0530 (IST) From: Kedareswara rao Appana To: , , , , , , , , , , , , Subject: [PATCH 4/4] dmaengine: dma: Rename driver and config Date: Fri, 10 Jun 2016 14:42:34 +0530 Message-ID: <1465549954-30220-5-git-send-email-appanad@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1465549954-30220-1-git-send-email-appanad@xilinx.com> References: <1465549954-30220-1-git-send-email-appanad@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22382.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(2201001)(11100500001)(36386004)(36756003)(48376002)(45336002)(103686003)(46386002)(63266004)(50986999)(76176999)(86362001)(42186005)(106466001)(229853001)(50466002)(52956003)(6806005)(5008740100001)(90966002)(2950100001)(87936001)(2906002)(33646002)(586003)(19580395003)(19580405001)(8936002)(50226002)(81166006)(8676002)(81156014)(92566002)(47776003)(4326007)(5001770100001)(5003940100001)(189998001)(107986001)(921003)(83996005)(2101003)(5001870100001)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1NAM02HT039; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 6129faf2-ba36-49e8-12a4-08d3910f63e3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501002); SRVR:SN1NAM02HT039; X-Microsoft-Antispam-PRVS: <607d52dabc4a4f5aafe380ac1f62d43a@SN1NAM02HT039.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(5005006)(13017025)(13018025)(13023025)(13024025)(8121501046)(3002001)(10201501046)(6055026); SRVR:SN1NAM02HT039; BCL:0; PCL:0; RULEID:; SRVR:SN1NAM02HT039; X-Forefront-PRVS: 096943F07A X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2016 09:12:47.0265 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT039 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160610_021310_460067_687C7F46 X-CRM114-Status: GOOD ( 10.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In the existing vdma driver support for AXI DMA and CDMA got added so the driver is no longer VDMA specific. This patch renames the driver and DT binding doc to xilinx_dma and updates the Kconfig description for all the DMAS. Signed-off-by: Kedareswara rao Appana --- .../dma/xilinx/{xilinx_vdma.txt => xilinx_dma.txt} | 0 drivers/dma/Kconfig | 13 +++++++++---- drivers/dma/xilinx/Makefile | 2 +- drivers/dma/xilinx/{xilinx_vdma.c => xilinx_dma.c} | 0 4 files changed, 10 insertions(+), 5 deletions(-) rename Documentation/devicetree/bindings/dma/xilinx/{xilinx_vdma.txt => xilinx_dma.txt} (100%) rename drivers/dma/xilinx/{xilinx_vdma.c => xilinx_dma.c} (100%) diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt similarity index 100% rename from Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt rename to Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 01a53ed..d7c03b6 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -519,19 +519,24 @@ config XGENE_DMA help Enable support for the APM X-Gene SoC DMA engine. -config XILINX_VDMA - tristate "Xilinx AXI VDMA Engine" +config XILINX_DMA + tristate "Xilinx AXI DMAS Engine" depends on (ARCH_ZYNQ || MICROBLAZE || ARM64) select DMA_ENGINE help - Enable support for Xilinx AXI VDMA Soft IP. + Enable support for Xilinx AXI DMAS Soft IP. - This engine provides high-bandwidth direct memory access + AXI VDMA engine provides high-bandwidth direct memory access between memory and AXI4-Stream video type target peripherals including peripherals which support AXI4- Stream Video Protocol. It has two stream interfaces/ channels, Memory Mapped to Stream (MM2S) and Stream to Memory Mapped (S2MM) for the data transfers. + AXI CDMA engine provides high-bandwidth direct memory access + between a memory-mapped source address and a memory-mapped + destination address. + AXI DMA engine provides high-bandwidth one dimensional direct + memory access between memory and AXI4-Stream target peripherals. config XILINX_ZYNQMP_DMA tristate "Xilinx ZynqMP DMA Engine" diff --git a/drivers/dma/xilinx/Makefile b/drivers/dma/xilinx/Makefile index 95469dc..9e91f8f 100644 --- a/drivers/dma/xilinx/Makefile +++ b/drivers/dma/xilinx/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_XILINX_VDMA) += xilinx_vdma.o +obj-$(CONFIG_XILINX_DMA) += xilinx_dma.o obj-$(CONFIG_XILINX_ZYNQMP_DMA) += zynqmp_dma.o diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_dma.c similarity index 100% rename from drivers/dma/xilinx/xilinx_vdma.c rename to drivers/dma/xilinx/xilinx_dma.c