linux-toradex.git/drivers/mmc, branch v2.6.30-rc5 Linux kernel for Apalis and Colibri modules Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 2009-05-05T15:23:16+00:00 Linus Torvalds torvalds@linux-foundation.org 2009-05-05T15:23:16+00:00 37ecfd807b82bf547429fe1376e1fe7000ba7cff * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mvsdio: fix CONFIG_PM=y build mmci: fix crash with debug enabled sdhci: catch ADMA errors mmc: increase power up delay sdhci-pci: bad error handling in probe function mmc_block: be prepared for oversized requests 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mvsdio: fix CONFIG_PM=y build
  mmci: fix crash with debug enabled
  sdhci: catch ADMA errors
  mmc: increase power up delay
  sdhci-pci: bad error handling in probe function
  mmc_block: be prepared for oversized requests
mvsdio: fix CONFIG_PM=y build 2009-05-03T20:12:46+00:00 Rabin Vincent rabin@rab.in 2009-04-20T18:44:54+00:00 2e058a6fb004a6b6c3eb6a219ae408f83b670598 Fix usage of obsolete parameters and functions in the driver's PM callbacks. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
Fix usage of obsolete parameters and functions in the driver's PM
callbacks.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Acked-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
mmci: fix crash with debug enabled 2009-05-03T20:12:27+00:00 Rabin Vincent rabin@rab.in 2009-04-17T03:14:19+00:00 4ea580f1db62c5419e6690878fd61a740f3aae8e If MMC debugging is enabled, the mmci driver oopses because the DBG macro uses host->mmc before it is set. Set it earlier. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
If MMC debugging is enabled, the mmci driver oopses because the DBG
macro uses host->mmc before it is set.  Set it earlier.

Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
sdhci: catch ADMA errors 2009-05-03T20:11:48+00:00 Pierre Ossman pierre@ossman.eu 2009-04-10T21:55:42+00:00 4accfe2577fab83e41db02282570e849f24ddf53 We forgot to add the ADMA error bit to the list of data interrupts. Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
We forgot to add the ADMA error bit to the list of data interrupts.

Signed-off-by: Pierre Ossman <pierre@ossman.eu>
mmc: increase power up delay 2009-05-03T20:11:31+00:00 José M. Fernández josemariafg@gmail.com 2009-03-10T01:21:21+00:00 79bccc5aefb4e64e651abe04f78c3e6bf8acd6f0 The TI controller on Toshiba Tecra M5 needs more time to power up or the cards will init incorrectly or not at all. Signed-off-by: José M. Fernández <josemariafg@gmail.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
The TI controller on Toshiba Tecra M5 needs more time to power up or
the cards will init incorrectly or not at all.

Signed-off-by: José M. Fernández <josemariafg@gmail.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
sdhci-pci: bad error handling in probe function 2009-05-03T20:11:19+00:00 Dan Carpenter error27@gmail.com 2009-04-10T21:31:10+00:00 c60a32cd129b1c41f98888b03ba2904406bac8f8 The goto unmap is too early, we haven't allocated host or done the request_region(). Found by smatch (http://repo.or.cz/w/smatch.git). [ Second error path fix by Pierre Ossman ] Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
The goto unmap is too early, we haven't allocated host or done the
request_region().

Found by smatch (http://repo.or.cz/w/smatch.git).

[ Second error path fix by Pierre Ossman ]

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
mmc_block: be prepared for oversized requests 2009-05-03T20:11:00+00:00 Pierre Ossman pierre@ossman.eu 2009-04-10T15:52:57+00:00 548d2de9bd978a4d4e941477500f1ab97aade137 The block layer does not support very low sector count restrictions so we need to be prepared to handle bigger requests than we can send directly to the controller. Problem found by Manuel Lauss. Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
The block layer does not support very low sector count restrictions
so we need to be prepared to handle bigger requests than we can send
directly to the controller.

Problem found by Manuel Lauss.

Signed-off-by: Pierre Ossman <pierre@ossman.eu>
ARM: OMAP: MMC: Remove unused power_pin 2009-04-23T18:10:44+00:00 Ladislav Michl ladis@linux-mips.org 2009-04-23T18:10:44+00:00 1748ae0e95760d62de501743f883af6833f33357 Remove unused power_pin Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Signed-off-by: Tony Lindgren <tony@atomide.com> 
Remove unused power_pin

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
mmc_spi: support for non-byte-aligned cards 2009-04-08T18:45:51+00:00 Wolfgang Muees wolfgang.mues@auerswald.de 2009-04-08T08:48:58+00:00 ab5a643cf597f2214feb6ff7288c72589661bde1 A very large subset of SD cards in the market send their responses and data non-byte-aligned. So add logic to the mmc spi driver to handle this mess. Signed-off-by: Wolfgang Muees <wolfgang.mues@auerswald.de> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
A very large subset of SD cards in the market send their
responses and data non-byte-aligned. So add logic to the
mmc spi driver to handle this mess.

Signed-off-by: Wolfgang Muees <wolfgang.mues@auerswald.de>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
omap_hsmmc: Do not expect cmd/data to be non-null when CC/TC occurs 2009-04-08T18:43:38+00:00 Jarkko Lavinen jarkko.lavinen@nokia.com 2009-04-08T08:18:32+00:00 a8fe29d8bcdfbf85ba26c7f3522c4bdfbc83e71d With spurious interrupt cmd can be null even when we have CC set in irq status. Fixes: NB#106295 - prevent potential kernel crash in the MMC driver Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com> Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Signed-off-by: Pierre Ossman <pierre@ossman.eu> 
With spurious interrupt cmd can be null even when we have CC
set in irq status.

Fixes: NB#106295 - prevent potential kernel crash in the MMC driver

Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>