diff options
| author | Yusuke Goda <yusuke.goda.sx@renesas.com> | 2010-08-30 12:50:19 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-29 00:29:16 +0200 |
| commit | f1334fb3c3006ba109886158c0ad79512f928bc1 (patch) | |
| tree | 99038a92a9e1bf77e96129473614fad4d99a0d33 /drivers/mfd/sh_mobile_sdhi.c | |
| parent | ARM: mach-shmobile: ap4evb: Fix hotplug for SDHI1 (diff) | |
| download | linux-f1334fb3c3006ba109886158c0ad79512f928bc1.tar.xz linux-f1334fb3c3006ba109886158c0ad79512f928bc1.zip | |
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 <yusuke.goda.sx@renesas.com>
Signed-off-by: Matt Fleming <matt@console-pimps.org>
Acked-by: Magnus Damm <damm@opensource.se>
Tested-by: Arnd Hannemann <arnd@arndnet.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/sh_mobile_sdhi.c')
| -rw-r--r-- | drivers/mfd/sh_mobile_sdhi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 01d83a41d570..f1714f93af9d 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; |