Commit 4b8be38cf782f8ebebc089083fa0572ade79d7ca
Exists in
master
and in
38 other branches
Merge tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
MMC highlights for 3.3: Core: * Support for the HS200 high-speed eMMC mode. * Support SDIO 3.0 Ultra High Speed cards. * Kill pending block requests immediately if card is removed. * Enable the eMMC feature for locking boot partitions read-only until next power on, exposed via sysfs. Drivers: * Runtime PM support for Intel Medfield SDIO. * Suspend/resume support for sdhci-spear. * sh-mmcif now processes requests asynchronously. * tag 'mmc-merge-for-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (58 commits) mmc: fix a deadlock between system suspend and MMC block IO mmc: sdhci: restore the enabled dma when do reset all mmc: dw_mmc: miscaculated the fifo-depth with wrong bit operation mmc: host: Adds support for eMMC 4.5 HS200 mode mmc: core: HS200 mode support for eMMC 4.5 mmc: dw_mmc: fixed wrong bit operation for SDMMC_GET_FCNT() mmc: core: Separate the timeout value for cache-ctrl mmc: sdhci-spear: Fix compilation error mmc: sdhci: Deal with failure case in sdhci_suspend_host mmc: dw_mmc: Clear the DDR mode for non-DDR mmc: sd: Fix SDR12 timing regression mmc: sdhci: Fix tuning timer incorrect setting when suspending host mmc: core: Add option to prevent eMMC sleep command mmc: omap_hsmmc: use threaded irq handler for card-detect. mmc: sdhci-pci: enable runtime PM for Medfield SDIO mmc: sdhci: Always pass clock request value zero to set_clock host op mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION mmc: sdhci-pci: get gpio numbers from platform data mmc: sdhci-pci: add platform data mmc: sdhci: prevent card detection activity for non-removable cards ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 67 changed files Side-by-side Diff
- Documentation/mmc/mmc-dev-attrs.txt
- Documentation/mmc/mmc-dev-parts.txt
- arch/arm/plat-samsung/include/plat/sdhci.h
- arch/arm/plat-samsung/platformdata.c
- drivers/Makefile
- drivers/mmc/Makefile
- drivers/mmc/card/block.c
- drivers/mmc/card/mmc_test.c
- drivers/mmc/card/queue.c
- drivers/mmc/core/Makefile
- drivers/mmc/core/bus.c
- drivers/mmc/core/cd-gpio.c
- drivers/mmc/core/core.c
- drivers/mmc/core/core.h
- drivers/mmc/core/debugfs.c
- drivers/mmc/core/host.c
- drivers/mmc/core/mmc.c
- drivers/mmc/core/sd.c
- drivers/mmc/core/sdio.c
- drivers/mmc/core/sdio_io.c
- drivers/mmc/core/sdio_ops.c
- drivers/mmc/host/Makefile
- drivers/mmc/host/at91_mci.c
- drivers/mmc/host/bfin_sdh.c
- drivers/mmc/host/cb710-mmc.c
- drivers/mmc/host/dw_mmc.c
- drivers/mmc/host/dw_mmc.h
- drivers/mmc/host/jz4740_mmc.c
- drivers/mmc/host/mmc_spi.c
- drivers/mmc/host/mmci.c
- drivers/mmc/host/msm_sdcc.c
- drivers/mmc/host/mxcmmc.c
- drivers/mmc/host/mxs-mmc.c
- drivers/mmc/host/omap_hsmmc.c
- drivers/mmc/host/pxamci.c
- drivers/mmc/host/s3cmci.c
- drivers/mmc/host/sdhci-cns3xxx.c
- drivers/mmc/host/sdhci-dove.c
- drivers/mmc/host/sdhci-esdhc-imx.c
- drivers/mmc/host/sdhci-esdhc.h
- drivers/mmc/host/sdhci-of-esdhc.c
- drivers/mmc/host/sdhci-of-hlwd.c
- drivers/mmc/host/sdhci-pci-data.c
- drivers/mmc/host/sdhci-pci.c
- drivers/mmc/host/sdhci-pxav2.c
- drivers/mmc/host/sdhci-pxav3.c
- drivers/mmc/host/sdhci-s3c.c
- drivers/mmc/host/sdhci-spear.c
- drivers/mmc/host/sdhci-tegra.c
- drivers/mmc/host/sdhci.c
- drivers/mmc/host/sdhci.h
- drivers/mmc/host/sh_mmcif.c
- drivers/mmc/host/sh_mobile_sdhi.c
- drivers/mmc/host/tifm_sd.c
- drivers/mmc/host/tmio_mmc.c
- drivers/mmc/host/tmio_mmc.h
- drivers/mmc/host/tmio_mmc_pio.c
- include/linux/amba/mmci.h
- include/linux/mmc/card.h
- include/linux/mmc/cd-gpio.h
- include/linux/mmc/core.h
- include/linux/mmc/dw_mmc.h
- include/linux/mmc/host.h
- include/linux/mmc/mmc.h
- include/linux/mmc/sdhci-pci-data.h
- include/linux/mmc/sdhci.h
- include/linux/mmc/sdio.h