From patchwork Tue Nov 23 16:24:19 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: 349961
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oANGO5sM006718
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Tue, 23 Nov 2010 16:24:14 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755519Ab0KWQYN (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Tue, 23 Nov 2010 11:24:13 -0500
Received: from mailout-de.gmx.net ([213.165.64.23]:39316 "HELO mail.gmx.net"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP
	id S1753962Ab0KWQYN (ORCPT <rfc822;linux-mmc@vger.kernel.org>);
	Tue, 23 Nov 2010 11:24:13 -0500
Received: (qmail invoked by alias); 23 Nov 2010 16:24:11 -0000
Received: from p50898979.dip0.t-ipconnect.de (EHLO axis700.grange)
	[80.137.137.121]
	by mail.gmx.net (mp043) with SMTP; 23 Nov 2010 17:24:11 +0100
X-Authenticated: #20450766
X-Provags-ID: V01U2FsdGVkX1+lA1hTxqalXxAVzjPFW24uueflZ+57YlRwMNMHgy
	vQMkewagIqS+aJ
Received: from lyakh (helo=localhost)
	by axis700.grange with local-esmtp (Exim 4.63)
	(envelope-from <g.liakhovetski@gmx.de>)
	id 1PKvfH-0007DF-Ix; Tue, 23 Nov 2010 17:24:19 +0100
Date: Tue, 23 Nov 2010 17:24:19 +0100 (CET)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-mmc@vger.kernel.org
cc: linux-sh@vger.kernel.org, Ian Molton <ian@mnementh.co.uk>,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 3/3] mfd: sdhi: require the tmio-mmc driver to bounce
	unaligned buffers
In-Reply-To: <Pine.LNX.4.64.1011231711240.25676@axis700.grange>
Message-ID: <Pine.LNX.4.64.1011231723370.25676@axis700.grange>
References: <Pine.LNX.4.64.1011231711240.25676@axis700.grange>
MIME-Version: 1.0
X-Y-GMX-Trusted: 0
Sender: linux-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 23 Nov 2010 16:24:14 +0000 (UTC)


diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index f1714f9..3ca20ec 100644
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -136,6 +136,7 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
 		priv->param_rx.slave_id = p->dma_slave_rx;
 		priv->dma_priv.chan_priv_tx = &priv->param_tx;
 		priv->dma_priv.chan_priv_rx = &priv->param_rx;
+		priv->dma_priv.alignment_shift = 1; /* 2-byte alignment */
 		mmc_data->dma = &priv->dma_priv;
 	}