From patchwork Fri Dec  4 18:45:13 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
X-Patchwork-Id: 64941
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB4Ik8dw025654
	for <patchwork-sh@patchwork.kernel.org>; Fri, 4 Dec 2009 18:46:09 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757180AbZLDSoz (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Fri, 4 Dec 2009 13:44:55 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757179AbZLDSoy
	(ORCPT <rfc822; linux-sh-outgoing>); Fri, 4 Dec 2009 13:44:54 -0500
Received: from mail.gmx.net ([213.165.64.20]:49056 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1757168AbZLDSov (ORCPT <rfc822;linux-sh@vger.kernel.org>);
	Fri, 4 Dec 2009 13:44:51 -0500
Received: (qmail invoked by alias); 04 Dec 2009 18:44:57 -0000
Received: from p57BD184F.dip0.t-ipconnect.de (EHLO axis700.grange)
	[87.189.24.79]
	by mail.gmx.net (mp007) with SMTP; 04 Dec 2009 19:44:57 +0100
X-Authenticated: #20450766
X-Provags-ID: V01U2FsdGVkX1+QJ0ZoXPOQJ9G2iFzJ3fEwpDUaG6FG8lt9gq7sVX
	LHngqYqQ6Y6Dwp
Received: from lyakh (helo=localhost)
	by axis700.grange with local-esmtp (Exim 4.63)
	(envelope-from <g.liakhovetski@gmx.de>)
	id 1NGd9V-0002OD-3f; Fri, 04 Dec 2009 19:45:13 +0100
Date: Fri, 4 Dec 2009 19:45:13 +0100 (CET)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-kernel@vger.kernel.org
cc: Dan Williams <dan.j.williams@intel.com>, linux-sh@vger.kernel.org,
	Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH 5/5] sh: dmaengine support for sh7724
In-Reply-To: <Pine.LNX.4.64.0912041936541.3981@axis700.grange>
Message-ID: <Pine.LNX.4.64.0912041942330.3981@axis700.grange>
References: <Pine.LNX.4.64.0912041936541.3981@axis700.grange>
MIME-Version: 1.0
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.47
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org


diff --git a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h b/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h
index f0886bc..c4ed660 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h
@@ -19,10 +19,10 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7723) || \
       defined(CONFIG_CPU_SUBTYPE_SH7724)
 #define DMTE0_IRQ	48	/* DMAC0A*/
-#define DMTE4_IRQ	40	/* DMAC0B */
-#define DMTE6_IRQ	42
-#define DMTE8_IRQ	76	/* DMAC1A */
-#define DMTE9_IRQ	77
+#define DMTE4_IRQ	76	/* DMAC0B */
+#define DMTE6_IRQ	40
+#define DMTE8_IRQ	42	/* DMAC1A */
+#define DMTE9_IRQ	43
 #define DMTE10_IRQ	72	/* DMAC1B */
 #define DMTE11_IRQ	73
 #define DMAE0_IRQ	78	/* DMA Error IRQ*/
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
index 6dc4469..da55a4e 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -23,9 +23,22 @@
 #include <linux/notifier.h>
 #include <asm/suspend.h>
 #include <asm/clock.h>
+#include <asm/dma-sh.h>
 #include <asm/mmzone.h>
 #include <cpu/sh7724.h>
 
+static struct sh_dmae_pdata dma_platform_data = {
+	.mode = SHDMA_DMAOR1,
+};
+
+static struct platform_device dma_device = {
+	.name		= "sh-dma-engine",
+	.id		= -1,
+	.dev		= {
+		.platform_data	= &dma_platform_data,
+	},
+};
+
 /* Serial */
 static struct plat_sci_port sci_platform_data[] = {
 	{
@@ -533,6 +546,7 @@ static struct platform_device *sh7724_devices[] __initdata = {
 	&tmu3_device,
 	&tmu4_device,
 	&tmu5_device,
+	&dma_device,
 	&sci_device,
 	&rtc_device,
 	&iic0_device,