linux-toradex.git/drivers/mmc, branch v3.2.1

Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

2011-12-30T21:45:34+00:00

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7237/1: PL330: Fix driver freeze
  ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
  ARM: 7196/1: errata: Remove SMP dependency for erratum 720789
  ARM: 7220/1: mmc: mmci: Fixup error handling for dma
  ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR

mmc: vub300: fix type of firmware_rom_wait_states module parameter

2011-12-19T23:56:09+00:00

You didn't mean this to be a bool.

Signed-off-by: Rusty Russell 
Acked-by: Tony Olech 
Cc: 
Signed-off-by: Chris Ball

Revert "mmc: enable runtime PM by default"

2011-12-19T23:51:38+00:00

When SDIO runtime PM was originally introduced, we immediately faced
two regressions with two different chipsets, and in response decided
not to enable it by default.

With the recent work on the 8686 we hoped we found all the gotchas,
so 08da834 did make sense (at least experimentally).

Unfortunately we now see that some setups out there still refuse to
work when SDIO runtime PM is enabled by default (see
http://www.spinics.net/lists/linux-mmc/msg11161.html), and obviously
we can't live with these kind of regressions.

This reverts commit 08da834a24312157f512224691ad1fddd11c1073.

Signed-off-by: Ohad Ben-Cohen 
Cc: Daniel Drake 
Signed-off-by: Chris Ball

mmc: sdhci: remove "state" argument from sdhci_suspend_host

2011-12-19T23:50:11+00:00

Drop the "state" argument from sdhci_suspend_host.  Its only user is the
PCI glue;  this allows to move all SDHCI glues to use dev_pm_ops instead.

Signed-off-by: Manuel Lauss 
Acked-by: Adrian Hunter 
Signed-off-by: Chris Ball

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

2011-12-18T23:07:22+00:00

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

Cc: 
Tested-by: Linus Walleij 
Signed-off-by: Per Forlin 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King

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

2011-12-18T23:05:57+00:00

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

Cc: 
Tested-by: Linus Walleij 
Signed-off-by: Ulf Hansson 
Signed-off-by: Russell King

mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined

2011-12-10T21:18:39+00:00

mmc_suspend_host() tries to claim host during suspend
and release it only when the bus suspend operation is
compeleted. If CONFIG_MMC_UNSAFE_RESUME is defined and
the host is flagged as removable, mmc_suspend_host()
tries to remove the card. In this process, the file system
sync can get blocked trying to acquire host which is already
claimed by mmc_suspend_host() causing deadlock.

Fix this deadlock by releasing host before ->remove() is called.

Signed-off-by: Sujit Reddy Thumma 
Acked-by: Ulf Hansson 
Acked-by: Linus Walleij 
Signed-off-by: Chris Ball

mmc: sdhci-s3c: Remove old and misprototyped suspend operations

2011-12-10T21:18:39+00:00

Now that the driver is using dev_pm_ops the suspend operations in the
platform_driver structure won't get called so don't need to be there,
and certainly shouldn't be the same function as dev_pm_ops since the
signatures are different.

Signed-off-by: Mark Brown 
Acked-by: Jaehoon Chung 
Signed-off-by: Chris Ball

mmc: tmio: fix clock gating on platforms with a .set_pwr() method

2011-12-10T21:18:38+00:00

Do not power down the card in .set_ios(), unless MMC_POWER_OFF is
requested. This fixes the SDHI functionality on ecovec.

Signed-off-by: Guennadi Liakhovetski 
Signed-off-by: Chris Ball

mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method

2011-12-10T21:18:37+00:00

Do not power down the card in .set_ios(), unless MMC_POWER_OFF is
requested. This fixes the MMCIF interface functionality on ecovec boards.

Signed-off-by: Guennadi Liakhovetski 
Signed-off-by: Chris Ball