From f1334fb3c3006ba109886158c0ad79512f928bc1 Mon Sep 17 00:00:00 2001 From: Yusuke Goda Date: Mon, 30 Aug 2010 11:50:19 +0100 Subject: mmc: Allow 2 byte requests in 4-bit mode for tmio_mmc Adjust the tmio_mmc block size check to accept 2-byte requests in 4-bit mode if the hardware supports it. Tested with the SDHI hardware block included in sh7724. Signed-off-by: Yusuke Goda Signed-off-by: Matt Fleming Acked-by: Magnus Damm Tested-by: Arnd Hannemann Signed-off-by: Samuel Ortiz --- drivers/mfd/sh_mobile_sdhi.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/mfd') diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 01d83a41d57..f1714f93af9 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c @@ -125,6 +125,12 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) mmc_data->capabilities |= p->tmio_caps; } + /* + * All SDHI blocks support 2-byte and larger block sizes in 4-bit + * bus width mode. + */ + mmc_data->flags |= TMIO_MMC_BLKSZ_2BYTES; + if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) { priv->param_tx.slave_id = p->dma_slave_tx; priv->param_rx.slave_id = p->dma_slave_rx; -- cgit v1.2.3