• Linus Torvalds's avatar
    Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 92bf3d09
    Linus Torvalds authored
    Pull MMC changes from Chris Ball
     - at91-mci: This driver will be replaced by atmel-mci in 3.7.
     - atmel-mci: Add support for old at91-mci hardware.
     - dw_mmc: Allow multiple controllers; this previously caused
       corruption.
     - imxmmc: Remove this driver, replaced by mxcmmc.
     - mmci: Add device tree support.
     - omap: Allow multiple controllers.
     - omap_hsmmc: Auto CMD12, DDR support.
     - tegra: Support SD 3.0 spec.
    
    Fix up the usual trivial conflicts in feature-removal-schedule.txt
    
    * tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (38 commits)
      mmc: at91-mci: this driver is now deprecated
      mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq
      mmc: block: Allow disabling 512B sector size emulation
      mmc: atmel-mci: add debug logs
      mmc: atmel-mci: add support for version lower than v2xx
      mmc: atmel-mci: change the state machine for compatibility with old IP
      mmc: atmel-mci: the r/w proof capability lack was not well managed
      mmc: dw_mmc: Fixed sdio interrupt mask bit setting bug
      mmc: omap: convert to module_platform_driver
      mmc: omap: make it behave well as a module
      mmc: omap: convert to per instance workqueue
      mmc: core: Remove dead code
      mmc: card: Avoid null pointer dereference
      mmc: core: Prevent eMMC VCC supply to be cut from late init
      mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue
      mmc: queue: remove redundant memsets
      mmc: queue: rename mmc_request function
      mmc: core: skip card initialization if power class selection fails
      mmc: core: fix the signaling 1.8V for HS200
      mmc: core: fix the decision of HS200/DDR card-type
      ...
    92bf3d09
sdhci-tegra.c 10.8 KB