linux-toradex.git/drivers/mmc/host, branch v3.0.34

mmc: unbreak sdhci-esdhc-imx on i.MX25

2012-05-07T15:56:35+00:00

commit b89152824f993a9572b47eb31f4579feadeac34c upstream.

This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
extensive tests would have shown that read or write of data to the
card were failing (even if the partition table was correctly read).

Signed-off-by: Eric Bénard 
Acked-by: Wolfram Sang 
Signed-off-by: Chris Ball 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Greg Kroah-Hartman

mmc: atmel-mci: correct data timeout computation

2012-04-13T15:14:07+00:00

commit 66292ad92c6d3f2f1c137a1c826b331ca8595dfd upstream.

The HSMCI operates at a rate of up to Master Clock divided by two.
Moreover previous calculation can cause overflows and so wrong
timeouts.

Signed-off-by: Ludovic Desroches 
Acked-by: Nicolas Ferre 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5

2012-03-12T17:32:55+00:00

commit 5b6b0ad6e572b32a641116aaa5f897ffebe31e44 upstream.

On i.MX53 we have to write a special SDHCI_CMD_ABORTCMD to the
SDHCI_TRANSFER_MODE register during a MMC_STOP_TRANSMISSION
command. This works for SD cards. However, with MMC cards
the MMC_SET_BLOCK_COUNT command is used instead, but this
needs the same handling. Fix MMC cards by testing for the
MMC_SET_BLOCK_COUNT command aswell. Tested on a custom i.MX53
board with a Transcend MMC+ card and eMMC.

The kernel started used MMC_SET_BLOCK_COUNT in 3.0, so this
is a regression for these boards introduced in 3.0; it should
go to 3.0/3.1/3.2-stable.

Signed-off-by: Sascha Hauer 
Acked-by: Shawn Guo 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sd: Fix SDR12 timing regression

2012-01-26T01:24:46+00:00

commit dd8df17fe83483d7ea06ff229895e35a42071599 upstream.

This patch fixes a failure to recognize SD cards reported on a Dell
Vostro with O2 Micro SD card reader.  Patch 49c468f ("mmc: sd: add
support for uhs bus speed mode selection") caused the problem, by
setting the SDHCI_CTRL_HISPD flag even for legacy timings.

Signed-off-by: Alexander Elbs 
Acked-by: Philip Rakity 
Acked-by: Arindam Nath 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: sdhci: Fix tuning timer incorrect setting when suspending host

2012-01-26T01:24:46+00:00

commit c6ced0db08010ed75df221a2946c5228454b38d5 upstream.

When suspending host, the tuning timer shoule be deactivated.
And the HOST_NEEDS_TUNING flag should be set after tuning timer is
deactivated.

Signed-off-by: Philip Rakity 
Signed-off-by: Aaron Lu 
Acked-by: Adrian Hunter 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

ARM: 7220/1: mmc: mmci: Fixup error handling for dma

2012-01-06T22:13:56+00:00

commit 3b6e3c73851a9a4b0e6ed9d378206341dd65e8a5 upstream.

When getting a cmd irq during an ongoing data transfer
with dma, the dma job were never terminated. This is now
corrected.

Tested-by: Linus Walleij 
Signed-off-by: Per Forlin 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King 
Signed-off-by: Greg Kroah-Hartman

ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR

2012-01-06T22:13:56+00:00

commit b63038d6f4ca5d1849ce01d9fc5bb9cb426dec73 upstream.

The interrupt was previously enabled and then correctly cleared.
Now we also handle it correctly.

Tested-by: Linus Walleij 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King 
Signed-off-by: Greg Kroah-Hartman

mmc: vub300: fix type of firmware_rom_wait_states module parameter

2012-01-06T22:13:52+00:00

commit 61074287c2965edf0fc75b54ae8f4ce99f182669 upstream.

You didn't mean this to be a bool.

Signed-off-by: Rusty Russell 
Acked-by: Tony Olech 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: mxcmmc: fix falling back to PIO

2011-12-21T20:57:39+00:00

commit e58f516ff4730c4047c3f104b061f7a03e9a263c upstream.

When we can't configure the dma channel we want to fall
back to PIO. We do this by setting host->do_dma to zero.
This does not work as do_dma is used to see whether dma
can be used for the current transfer. Instead, we have
to set host->dma to NULL.

Signed-off-by: Sascha Hauer 
Signed-off-by: Chris Ball 
Signed-off-by: Greg Kroah-Hartman

mmc: mxs-mmc: fix clock rate setting

2011-10-16T21:14:54+00:00

commit d982dcdc4e64eb1881df44b0035a8268bf1ab067 upstream.

Fix clock rate setting in the mxs-mmc driver. Previously, if div2 was 0
then the value for TIMING_CLOCK_RATE would have been 255 instead of 0.
The limits for div1 (TIMING_CLOCK_DIVIDE) and div2 (TIMING_CLOCK_RATE+1)
were also not correctly defined.

Can easily be reproduced on mx23evk: default clock for high speed sdio
cards is 50 MHz. With a SSP_CLK of 28.8 MHz default), this resulted in
an actual clock rate of about 56 kHz.  Tested on mx23evk.

Signed-off-by: Koen Beel 
Reviewed-by: Wolfram Sang 
Signed-off-by: Chris Ball 
Signed-off-by: Wolfram Sang 
Signed-off-by: Greg Kroah-Hartman