From patchwork Wed Apr 21 15:37:28 2010
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: 93894
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3LFaWhD007035
	for <patchwork-sh@patchwork.kernel.org>; Wed, 21 Apr 2010 15:38:53 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755777Ab0DUPhS (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Wed, 21 Apr 2010 11:37:18 -0400
Received: from mail.gmx.net ([213.165.64.20]:44046 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP
	id S1755776Ab0DUPhR (ORCPT <rfc822;linux-sh@vger.kernel.org>);
	Wed, 21 Apr 2010 11:37:17 -0400
Received: (qmail invoked by alias); 21 Apr 2010 15:37:15 -0000
Received: from p57BD1949.dip0.t-ipconnect.de (EHLO axis700.grange)
	[87.189.25.73]
	by mail.gmx.net (mp045) with SMTP; 21 Apr 2010 17:37:15 +0200
X-Authenticated: #20450766
X-Provags-ID: V01U2FsdGVkX19Dp/otxktDW0XsbRge4x1WFsnFKQEMyj6gRUYO1r
	NcIzBs/B7Qnl+5
Received: from lyakh (helo=localhost)
	by axis700.grange with local-esmtp (Exim 4.63)
	(envelope-from <g.liakhovetski@gmx.de>)
	id 1O4bzU-0004cA-Qk; Wed, 21 Apr 2010 17:37:28 +0200
Date: Wed, 21 Apr 2010 17:37:28 +0200 (CEST)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: "linux-sh@vger.kernel.org" <linux-sh@vger.kernel.org>
cc: linux-mmc@vger.kernel.org, Dan Williams <dan.j.williams@intel.com>,
	Ian Molton <ian@mnementh.co.uk>
Subject: [PATCH 6/8] SH: Add SDHI DMA support to ms7724se
In-Reply-To: <Pine.LNX.4.64.1004211715050.5292@axis700.grange>
Message-ID: <Pine.LNX.4.64.1004211735180.5292@axis700.grange>
References: <Pine.LNX.4.64.1004211715050.5292@axis700.grange>
MIME-Version: 1.0
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.46999999999999997
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 21 Apr 2010 15:38:53 +0000 (UTC)


diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 66cdbc3..70ddc92 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -14,6 +14,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/delay.h>
 #include <linux/smc91x.h>
@@ -24,6 +25,7 @@
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <sound/sh_fsi.h>
+#include <asm/dmaengine.h>
 #include <asm/io.h>
 #include <asm/heartbeat.h>
 #include <asm/sh_eth.h>
@@ -456,11 +458,20 @@ static struct resource sdhi0_cn7_resources[] = {
 	},
 };
 
+static struct sh_mobile_sdhi_info sh7724_sdhi0_data = {
+	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,
+	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,
+	.tmio_flags	= TMIO_IMMEDIATE_RX_COMPLETE,
+};
+
 static struct platform_device sdhi0_cn7_device = {
 	.name           = "sh_mobile_sdhi",
 	.id		= 0,
 	.num_resources  = ARRAY_SIZE(sdhi0_cn7_resources),
 	.resource       = sdhi0_cn7_resources,
+	.dev = {
+		.platform_data	= &sh7724_sdhi0_data,
+	},
 	.archdata = {
 		.hwblk_id = HWBLK_SDHI0,
 	},
@@ -479,11 +490,19 @@ static struct resource sdhi1_cn8_resources[] = {
 	},
 };
 
+static struct sh_mobile_sdhi_info sh7724_sdhi1_data = {
+	.dma_slave_tx = SHDMA_SLAVE_SDHI1_TX,
+	.dma_slave_rx = SHDMA_SLAVE_SDHI1_RX,
+};
+
 static struct platform_device sdhi1_cn8_device = {
 	.name           = "sh_mobile_sdhi",
 	.id		= 1,
 	.num_resources  = ARRAY_SIZE(sdhi1_cn8_resources),
 	.resource       = sdhi1_cn8_resources,
+	.dev = {
+		.platform_data	= &sh7724_sdhi1_data,
+	},
 	.archdata = {
 		.hwblk_id = HWBLK_SDHI1,
 	},