Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420dd6b2 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge branch 'mmc_from_3.14' into branch 'msm-3.18'



When migrating from msm-3.14 to msm-3.18, a number of recently-
merged changes were left behind. Pick them up now.

* mmc_from_3.14 (31 commit):
  mmc: cmdq_hci: Add Inline Crypto Engine (ICE) support
  mmc: cmdq_hci: Fix timing and response type for busy commands
  mmc: host: Fix spinbug in performance sysfs nodes
  mmc: queue: issue requests when dcmd is in progress
  mmc: core: fix shutdown in cmdq mode
  mmc: sdhci-msm: increase number of testbuses to 60
  mmc: queue: add timeout capability to requests
  mmc: sdhci: propagate error to command queue engine
  mmc: block: Add error handling to command queue host
  mmc: block: add support for partition switch
  mmc: sdhci-msm: do not disable test-bus
  mmc: sdhci-msm: add support for command-queue
  mmc: sdhci: add command queue support to sdhci
  mmc: cmdq-host: add halt support to command queue host
  mmc: core: Add halt support
  mmc: cmdq: support for command queue enabled host
  mmc: core: add flush request support to command queue
  mmc: card: add read/write support in command queue mode
  mmc: core: Add command queue initialzation support
  mmc: queue: initialization of command queue
  mmc: sdhci: Add Inline Crypto Engine (ICE) support
  mmc: sdhci-msm: Add Inline Crypto Engine (ICE) support
  mmc: sdhci-msm-ice: Add Inline Crypto Engine (ICE) support
  qcom: crypto: Add support for eMMC based ICE
  mmc: core: Fix crash in mmc clk-scaling
  mmc: fix MMC clock scaling to meet upstream HS400 implementation
  mmc: core: devfreq: migrate to devfreq based clock scaling
  Revert "mmc: sdhci-msm: Disable pm functionalities"
  defconfig: Enable MMC_CLKGATE on msm-perf_defconfig
  Revert "defconfig: Disable MMC_CLKGATE on msm-3.14"
  mmc: add support for scheduling mmcqd on idle CPU

Change-Id: I8c36dddba6a416038210764f530a41f86e2181a8
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 58d6bfbe 39259796
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment