c2ac2ae Merge tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

Merged and Committed by Linus Torvalds 11 years ago
54 files changed. 1818 lines added. 1240 lines removed.
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
file modified
+5 -0
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
file modified
+9 -0
arch/mips/configs/db1235_defconfig
file modified
+0 -1
arch/sh/boards/mach-ecovec24/setup.c
file modified
+1 -0
drivers/mmc/card/block.c
file modified
+0 -2
drivers/mmc/core/bus.c
file modified
+1 -1
drivers/mmc/core/core.c
file modified
+58 -96
drivers/mmc/core/core.h
file modified
+3 -3
drivers/mmc/core/mmc.c
file modified
+76 -51
drivers/mmc/core/mmc_ops.c
file modified
+63 -33
drivers/mmc/core/sd.c
file modified
+66 -52
drivers/mmc/core/sdio.c
file modified
+24 -58
drivers/mmc/host/atmel-mci.c
file modified
+15 -67
drivers/mmc/host/au1xmmc.c
file modified
+1 -6
drivers/mmc/host/bfin_sdh.c
file modified
+2 -13
drivers/mmc/host/cb710-mmc.c
file modified
+1 -9
drivers/mmc/host/davinci_mmc.c
file modified
+5 -21
drivers/mmc/host/dw_mmc-exynos.c
file modified
+265 -26
drivers/mmc/host/dw_mmc-pltfm.c
file modified
+0 -7
drivers/mmc/host/dw_mmc-socfpga.c
file modified
+16 -18
drivers/mmc/host/dw_mmc.c
file modified
+415 -189
drivers/mmc/host/dw_mmc.h
file modified
+55 -0
drivers/mmc/host/jz4740_mmc.c
file modified
+0 -4
drivers/mmc/host/mmci.c
file modified
+4 -13
drivers/mmc/host/msm_sdcc.c
file modified
+2 -25
drivers/mmc/host/mvsdio.c
file modified
+3 -32
drivers/mmc/host/mxcmmc.c
file modified
+2 -10
drivers/mmc/host/mxs-mmc.c
file modified
+2 -10
drivers/mmc/host/omap.c
file modified
+0 -53
drivers/mmc/host/omap_hsmmc.c
file modified
+32 -80
drivers/mmc/host/pxamci.c
file modified
+0 -32
drivers/mmc/host/rtsx_pci_sdmmc.c
file modified
+1 -34
drivers/mmc/host/s3cmci.c
file modified
+0 -29
drivers/mmc/host/sdhci-bcm-kona.c
file modified
+1 -13
drivers/mmc/host/sdhci-bcm2835.c
file modified
+1 -7
drivers/mmc/host/sdhci-esdhc-imx.c
file modified
+495 -55
drivers/mmc/host/sdhci-esdhc.h
file modified
+0 -37
drivers/mmc/host/sdhci-of-esdhc.c
file modified
+33 -2
drivers/mmc/host/sdhci-pci.c
file modified
+76 -0
drivers/mmc/host/sdhci.c
file modified
+23 -21
drivers/mmc/host/sdhci.h
file modified
+3 -0
drivers/mmc/host/sdricoh_cs.c
file modified
+0 -3
drivers/mmc/host/sh_mmcif.c
file modified
+12 -20
drivers/mmc/host/tifm_sd.c
file modified
+1 -3
drivers/mmc/host/tmio_mmc_pio.c
file modified
+3 -6
drivers/mmc/host/via-sdmmc.c
file modified
+1 -6
drivers/mmc/host/vub300.c
file modified
+2 -16
drivers/mmc/host/wbsd.c
file modified
+5 -29
drivers/mmc/host/wmt-sdmmc.c
file modified
+18 -39
include/linux/mmc/card.h
file modified
+5 -2
include/linux/mmc/core.h
file modified
+2 -2
include/linux/mmc/dw_mmc.h
file modified
+4 -0
include/linux/mmc/host.h
file modified
+1 -4
include/linux/platform_data/mmc-esdhc-imx.h
file modified
+5 -0
    Merge tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
    
    Pull MMC updates from Chris Ball:
     "MMC highlights for 3.13:
    
      Core:
       - Improve runtime PM support, remove mmc_{suspend,resume}_host().
       - Add MMC_CAP_RUNTIME_RESUME, for delaying MMC resume until we're
         outside of the resume sequence (in runtime_resume) to decrease
         system resume time.
    
      Drivers:
       - dw_mmc: Support HS200 mode.
       - sdhci-eshdc-imx: Support SD3.0 SDR clock tuning, DDR on IMX6.
       - sdhci-pci: Add support for Intel Clovertrail and Merrifield"
    
    * tag 'mmc-updates-for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (108 commits)
      mmc: wbsd: Silence compiler warning
      mmc: core: Silence compiler warning in __mmc_switch
      mmc: sh_mmcif: Convert to clk_prepare|unprepare
      mmc: sh_mmcif: Convert to PM macros when defining dev_pm_ops
      mmc: dw_mmc: exynos: Revert the sdr_timing assignment
      mmc: sdhci: Avoid needless loop while handling SDIO interrupts in sdhci_irq
      mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume
      mmc: core: Improve runtime PM support during suspend/resume for sd/mmc
      mmc: core: Remove redundant mmc_power_up|off at runtime callbacks
      mmc: Don't force card to active state when entering suspend/shutdown
      MIPS: db1235: Don't use MMC_CLKGATE
      mmc: core: Remove deprecated mmc_suspend|resume_host APIs
      mmc: mmci: Move away from using deprecated APIs
      mmc: via-sdmmc: Move away from using deprecated APIs
      mmc: tmio: Move away from using deprecated APIs
      mmc: sh_mmcif: Move away from using deprecated APIs
      mmc: sdricoh_cs: Move away from using deprecated APIs
      mmc: rtsx: Remove redundant suspend and resume callbacks
      mmc: wbsd: Move away from using deprecated APIs
      mmc: pxamci: Remove redundant suspend and resume callbacks
      ...
    
        
file modified
+0 -2
file modified
+1 -1
file modified
+58 -96
file modified
+3 -3
file modified
+76 -51
file modified
+63 -33
file modified
+66 -52
file modified
+24 -58
file modified
+15 -67
file modified
+1 -6
file modified
+2 -13
file modified
+1 -9
file modified
+265 -26
file modified
+415 -189
file modified
+55 -0
file modified
+4 -13
file modified
+2 -25
file modified
+3 -32
file modified
+2 -10
file modified
+2 -10
file modified
+0 -53
file modified
+32 -80
file modified
+0 -32
file modified
+0 -29
file modified
+76 -0
file modified
+23 -21
file modified
+3 -0
file modified
+12 -20
file modified
+1 -3
file modified
+1 -6
file modified
+2 -16
file modified
+5 -29
file modified
+18 -39
file modified
+5 -2
file modified
+2 -2
file modified
+4 -0
file modified
+1 -4