Skip to content
  • Linus Torvalds's avatar
    Merge tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc · e531cdf5
    Linus Torvalds authored
    Pull MMC updates from Ulf Hansson:
     "MMC core:
          - Fix ABI regression of MMC BLK ioctl
          - Remove the unused MMC_DATA_STREAM flag
          - Enable asynchronous system PM for the host device
          - Minor fixes and clean-ups
    
      SDHCI host:
         Throughout the years, the numbers of SDHCI variants have increased
         and so has also the numbers of SDHCI callbacks/quirks.  The purpose
         of these callbacks/quirks were to enable SDHCI to deal with variant
         specific requirements, but unfortunate this method didn't scale.
         Instead we have ended up with a mess.  Not only did the code become
         suboptimal but also highly fragile.
    
         Lately many discussions of how to move forward with SDHCI has taken
         place at the MMC mailing list.  Step by step, we aim to turn
         SDHCI's common code into a set of library functions.  This will
         enable for optimizations and allow some of the existing callbacks
         and quirks to be removed, which also should help to make the code
         less fragile.
    
         Therefore I am also really pleased to announce that Adrian Hunter
         (Intel) has volunteered to step in as the maintainer for SDHCI.
    
         Future wise, I hope the community around SDHCI will continue to
         grow and that this release cycle can be the starting point of
         moving SDHCI into a better shape.  As a matter of fact, already in
         this cycle the re-factoring has begun, but of course there are also
         fixes and new features included.  Some highlights:
    
          - sdhci-iproc: Add support for Broadcom's BCM2835 eMMC IP
          - sdhci-acpi: Add support for QCOM controllers
          - sdhci-pic32: Add new SDHCI variant for PIC32MZDA
    
      Other hosts:
          - atmel-mci: Fix a NULL pointer dereference
          - mediatek: Add SD write-protect support
          - mmc_spi: Fix card detect in GPIO case
          - tmio/sdhi: Add r8a7795 support
          - tmio/sdhi: Some fixes and clean-ups
          - dw_mmc: Add HW reset support
          - dw_mmc: Some fixes and clean-ups
          - sunxi: Add support for MMC DDR52 mode"
    
    * tag 'mmc-v4.6' of git://git.linaro.org/people/ulf.hansson/mmc: (123 commits)
      mmc: sdhci-of-at91: fix wake-up issue when using runtime pm
      mmc: sdhci-pci: Do not set DMA mask in enable_dma()
      mmc: sdhci-acpi: Remove enable_dma() hook
      mmc: sdhci: Set DMA mask when adding host
      mmc: block: fix ABI regression of mmc_blk_ioctl
      mmc: atmel-mci: Check pdata for NULL before dereferencing it at DMA config
      mmc: core: remove redundant memset of sdio_read_cccr
      mmc: core: remove redundant memset of mmc_decode_cid
      mmc: of_mmc_spi: fix unused warning
      mmc: sdhci-of-arasan: add phy support for sdhci-of-arasan
      mmc: sdhci-of-arasan: fix missing sdhci_pltfm_free for err handling
      mmc: sdhci-of-arasan: remove disable clk_ahb from sdhci_arasan_resume
      Documentation: bindings: add description of phy for sdhci-of-arasan
      mmc: sdhci: Fix override of timeout clk wrt max_busy_timeout
      mmc: mmci: Remove unnecessary header file
      mmc: sdhci-acpi: add QCOM controllers
      mmc: tegra: implement memcomp pad calibration
      mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch
      mmc: mediatek: Change signal voltage error to dev_dbg()
      mmc: sh_mmcif, tmio: Use ARCH_RENESAS
      ...
    e531cdf5