Merge branch 'master' of git://git.denx.de/u-boot-arm (2012-10-19 18:23:38
-0700)
are available in the git repository at:
git://www.denx.de/git/u-boot-mmc.git master
for you to fetch changes up to 757bff49ba3159d71ccacabdb68f8309b1eb6613:
mmc: dw-mmc: support DesignWare MMC Controller (2012-10-22 02:56:25 -0500)
----------------------------------------------------------------
Jaehoon Chung (3):
mmc: sdhci: increase the timeout value for data transfer
mmc: sdhci: add the DMA select for SDMA
mmc: dw-mmc: support DesignWare MMC Controller
Marek Vasut (7):
COMMON: Implement common bounce buffer
MMC: MXS: Convert MXS MMC driver to generic bounce buffer
MMC: MXS: Toggle the generic bounce buffer on the boards
MMC: Remove the MMC bounce buffer
mmc: Fix mmc_spi error on cmd->flags field
mmc: pxa: Flip over the remaining boards to pxa_mmc_generic
mmc: pxa: Remove the old non-generic PXA MMC driver
Tushar Behera (1):
mmc: sdhci: Add a quirk to add delay during completion of sdhci_send_cmd
board/lubbock/lubbock.c | 9 +
board/palmtc/palmtc.c | 9 +
board/pxa255_idp/pxa_idp.c | 9 +
board/trizepsiv/conxs.c | 9 +
common/Makefile | 1 +
common/bouncebuf.c | 92 ++++++
drivers/mmc/Makefile | 2 +-
drivers/mmc/dw_mmc.c | 385 +++++++++++++++++++++++++
drivers/mmc/mmc.c | 92 ------
drivers/mmc/mmc_spi.c | 4 +-
drivers/mmc/mxsmmc.c | 36 ++-
drivers/mmc/pxa_mmc.c | 643 ------------------------------------------
drivers/mmc/s5p_sdhci.c | 3 +-
drivers/mmc/sdhci.c | 12 +-
include/bouncebuf.h | 87 ++++++
include/configs/apx4devkit.h | 2 +-
include/configs/lubbock.h | 3 +-
include/configs/m28evk.h | 2 +-
include/configs/mx28evk.h | 2 +-
include/configs/palmtc.h | 3 +-
include/configs/pxa255_idp.h | 3 +-
include/configs/trizepsiv.h | 3 +-
include/dwmmc.h | 191 +++++++++++++
include/sdhci.h | 1 +
24 files changed, 843 insertions(+), 760 deletions(-)
create mode 100644 common/bouncebuf.c
create mode 100644 drivers/mmc/dw_mmc.c
delete mode 100644 drivers/mmc/pxa_mmc.c
create mode 100644 include/bouncebuf.h
create mode 100644 include/dwmmc.h
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
