Skip to contentSkip to conversation

MMC updates for 2.6.31-rc1

GIT PULL Pierre Ossman 1 participant 1 message Jun 13, 2009

lore
Share & tools
lore
#0 lore raw

Linus, please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git for-linus

to receive:

- A new host driver for the ENE CB710 proprietary interface

- A platform interface for sdhci. There are no users of this interface yet, but they are on the way.

- Initial merging work of atmel-mci and at91_mci

- A whole bunch of fixes for the recently added tmio_mmc driver

- The ability for the MMC layer to detect a removal and insertion in one detection pass (needed on systems which use a "cover" approach like Nokia 770/810/etc.)

and a whole bunch of other minor bug fixes.

There will (hopefully) be another pull for the MMC stuff during this merge window with two more drivers, one for a new Via chip and one for Samsung's newer SoCs.

 MAINTAINERS                       |    9 +
 drivers/mfd/t7l66xb.c             |    5 +
 drivers/mfd/tc6387xb.c            |    5 +
 drivers/mfd/tc6393xb.c            |    5 +
 drivers/misc/Kconfig              |    1 +
 drivers/misc/Makefile             |    1 +
 drivers/misc/cb710/Kconfig        |   25 ++
 drivers/misc/cb710/Makefile       |    8 +
 drivers/misc/cb710/core.c         |  357 ++++++++++++++++
 drivers/misc/cb710/debug.c        |  119 ++++++
 drivers/misc/cb710/sgbuf2.c       |  150 +++++++
 drivers/mmc/card/block.c          |   16 +-
 drivers/mmc/core/core.c           |  107 +++--
 drivers/mmc/host/Kconfig          |   28 ++-
 drivers/mmc/host/Makefile         |    5 +
 drivers/mmc/host/atmel-mci-regs.h |   33 ++
 drivers/mmc/host/cb710-mmc.c      |  804 +++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/cb710-mmc.h      |  104 +++++
 drivers/mmc/host/mmc_spi.c        |   23 +-
 drivers/mmc/host/mxcmmc.c         |    2 -
 drivers/mmc/host/omap.c           |    3 +-
 drivers/mmc/host/pxamci.c         |   46 ++-
 drivers/mmc/host/sdhci-pltfm.c    |  168 ++++++++
 drivers/mmc/host/sdhci.c          |   58 ++--
 drivers/mmc/host/sdhci.h          |    2 +-
 drivers/mmc/host/tmio_mmc.c       |  180 ++++-----
 drivers/mmc/host/tmio_mmc.h       |   77 ++++-
 include/linux/cb710.h             |  231 +++++++++++
 include/linux/mfd/tmio.h          |    7 +
 include/linux/pci_ids.h           |    1 +
 30 files changed, 2377 insertions(+), 203 deletions(-)
 create mode 100644 drivers/misc/cb710/Kconfig
 create mode 100644 drivers/misc/cb710/Makefile
 create mode 100644 drivers/misc/cb710/core.c
 create mode 100644 drivers/misc/cb710/debug.c
 create mode 100644 drivers/misc/cb710/sgbuf2.c
 create mode 100644 drivers/mmc/host/cb710-mmc.c
 create mode 100644 drivers/mmc/host/cb710-mmc.h
 create mode 100644 drivers/mmc/host/sdhci-pltfm.c
 create mode 100644 include/linux/cb710.h

Ben Dooks (2):
sdhci: Print ADMA status and pointer on debug
mmc_block: do not DMA to stack

Daniel Ribeiro (1):
pxamci: add regulator support.

Ian Molton (1):
tmio_mmc: fix clock setup

Jorg Schummer (1):
mmc: mmc_rescan detects card change in one run

Michał Mirosław (2):
mmc: Driver for CB710/720 memory card reader (MMC part)
cb710: more cleanup for the DEBUG case.

Nicolas Ferre (2):
atmel-mci: Integrate AT91 specific definition in header file
atmel-mci: add MCI2 register definitions

Philipp Zabel (6):
MFD,mmc: tmio_mmc: make HCLK configurable
tmio_mmc: add bus_shift support
tmio_mmc: don't use set_irq_type
tmio_mmc: correct probe return value for num_resources != 3
tmio_mmc: map SD control registers after enabling the MFD cell
tmio_mmc: allow compilation for ASIC3

Pierre Ossman (5):
sdhci: avoid changing voltage needlessly
cb710: fix printk format string
cb710: add missing parenthesis
cb710: handle DEBUG define in Makefile
mxcmmc: remove frequency workaround

Richard Röjfors (1):
sdhci: platform driver for SDHCI

Sascha Hauer (1):
MMC core: limit minimum initialization frequency to 400kHz

Uwe Kleine-König (1):
mmc/omap: make mmci-omap using platform_driver_probe

Wolfgang Muees (2):
mmc_spi: speedup for slow cards, less wear-out
mmc_spi: don't use EINVAL for possible transmission errors

Signature · 6 lines
     -- Pierre Ossman

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.