From patchwork Thu Dec 17 03:14:14 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
X-Patchwork-Id: 68496
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI4ixsD005715
	for <patchwork-sh@patchwork.kernel.org>; Fri, 18 Dec 2009 04:47:06 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758487AbZLQDOg (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Wed, 16 Dec 2009 22:14:36 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932660AbZLQDOf
	(ORCPT <rfc822; linux-sh-outgoing>);
	Wed, 16 Dec 2009 22:14:35 -0500
Received: from mail-pw0-f42.google.com ([209.85.160.42]:57585 "EHLO
	mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1758487AbZLQDOe convert rfc822-to-8bit (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Wed, 16 Dec 2009 22:14:34 -0500
Received: by pwj9 with SMTP id 9so1039620pwj.21
	for <multiple recipients>; Wed, 16 Dec 2009 19:14:34 -0800 (PST)
MIME-Version: 1.0
Received: by 10.142.120.2 with SMTP id s2mr1252670wfc.311.1261019674219;
	Wed, 16 Dec 2009 19:14:34 -0800 (PST)
In-Reply-To: <20091208071302.GA23814@linux-sh.org>
References: <Pine.LNX.4.64.0912041936541.3981@axis700.grange>
	<Pine.LNX.4.64.0912041942330.3981@axis700.grange>
	<e9c3a7c20912071702h1aea2026kff22db99a221f6c4@mail.gmail.com>
	<20091208071302.GA23814@linux-sh.org>
From: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Date: Thu, 17 Dec 2009 12:14:14 +0900
X-Google-Sender-Auth: 179e907fd7b59911
Message-ID: <29ab51dc0912161914w6967c9d1l79df27d670f01b6a@mail.gmail.com>
Subject: Re: [PATCH 5/5] sh: dmaengine support for sh7724
To: Paul Mundt <lethal@linux-sh.org>
Cc: Dan Williams <dan.j.williams@intel.com>,
	Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
	linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org
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 a52f351..d32f96c 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
@@ -23,9 +23,23 @@
 #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>

+/* DMA */
+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 scif0_platform_data = {
 	.mapbase        = 0xffe00000,
@@ -649,6 +663,7 @@ static struct platform_device *sh7724_devices[]
__initdata = {
 	&tmu3_device,
 	&tmu4_device,
 	&tmu5_device,
+	&dma_device,
 	&rtc_device,
 	&iic0_device,