Merge tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Support for MMC power sequences.
   - SDIO function devicetree subnode parsing.
   - Refactor the hardware reset routines and enable it for SD cards.
   - Various code quality improvements, especially for slot-gpio.

  MMC host:
   - dw_mmc: Various fixes and cleanups.
   - dw_mmc: Convert to mmc_send_tuning().
   - moxart: Fix probe logic.
   - sdhci: Various fixes and cleanups
   - sdhci: Asynchronous request handling support.
   - sdhci-pxav3: Various fixes and cleanups.
   - sdhci-tegra: Fixes for T114, T124 and T132.
   - rtsx: Various fixes and cleanups.
   - rtsx: Support for SDIO.
   - sdhi/tmio: Refactor and cleanup of header files.
   - omap_hsmmc: Use slot-gpio and common MMC DT parser.
   - Make all hosts to deal with errors from mmc_of_parse().
   - sunxi: Various fixes and cleanups.
   - sdhci: Support for Fujitsu SDHCI controller f_sdh30"

* tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc: (117 commits)
  mmc: sdhci-s3c: solve problem with sleeping in atomic context
  mmc: pwrseq: add driver for emmc hardware reset
  mmc: moxart: fix probe logic
  mmc: core: Invoke mmc_pwrseq_post_power_on() prior MMC_POWER_ON state
  mmc: pwrseq_simple: Add optional reference clock support
  mmc: pwrseq: Document optional clock for the simple power sequence
  mmc: pwrseq_simple: Extend to support more pins
  mmc: pwrseq: Document that simple sequence support more than one GPIO
  mmc: Add hardware dependencies for sdhci-pxav3 and sdhci-pxav2
  mmc: sdhci-pxav3: Modify clock settings for the SDR50 and DDR50 modes
  mmc: sdhci-pxav3: Extend binding with SDIO3 conf reg for the Armada 38x
  mmc: sdhci-pxav3: Fix Armada 38x controller's caps according to erratum ERR-7878951
  mmc: sdhci-pxav3: Fix SDR50 and DDR50 capabilities for the Armada 38x flavor
  mmc: sdhci: switch voltage before sdhci_set_ios in runtime resume
  mmc: tegra: Write xfer_mode, CMD regs in together
  mmc: Resolve BKOPS compatability issue
  mmc: sdhci-pxav3: fix setting of pdata->clk_delay_cycles
  mmc: dw_mmc: rockchip: remove incorrect __exit_p()
  mmc: dw_mmc: exynos: remove incorrect __exit_p()
  mmc: Fix menuconfig alignment of MMC_SDHCI_* options
  ...

1 files changed, 90 insertions, 62 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 9584bffa8b22..23f10f72e5f3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -40,6 +40,7 @@
 #include "bus.h"
 #include "host.h"
 #include "sdio_bus.h"
+#include "pwrseq.h"
 
 #include "mmc_ops.h"
 #include "sd_ops.h"
@@ -185,13 +186,14 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
 
 EXPORT_SYMBOL(mmc_request_done);
 
-static void
-mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
+static int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 {
 #ifdef CONFIG_MMC_DEBUG
         unsigned int i, sz;
         struct scatterlist *sg;
 #endif
+        if (mmc_card_removed(host->card))
+                return -ENOMEDIUM;
 
         if (mrq->sbc) {
                 pr_debug("<%s: starting CMD%u arg %08x flags %08x>\n",
@@ -251,6 +253,8 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
         mmc_host_clk_hold(host);
         led_trigger_event(host->led, LED_FULL);
         host->ops->request(host, mrq);
+
+        return 0;
 }
 
 /**
@@ -271,7 +275,7 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
 
         BUG_ON(!card);
 
-        if (!card->ext_csd.bkops_en || mmc_card_doing_bkops(card))
+        if (!card->ext_csd.man_bkops_en || mmc_card_doing_bkops(card))
                 return;
 
         err = mmc_read_bkops_status(card);
@@ -345,29 +349,34 @@ static void mmc_wait_done(struct mmc_request *mrq)
  */
 static int __mmc_start_data_req(struct mmc_host *host, struct mmc_request *mrq)
 {
+        int err;
+
         mrq->done = mmc_wait_data_done;
         mrq->host = host;
-        if (mmc_card_removed(host->card)) {
-                mrq->cmd->error = -ENOMEDIUM;
+
+        err = mmc_start_request(host, mrq);
+        if (err) {
+                mrq->cmd->error = err;
                 mmc_wait_data_done(mrq);
-                return -ENOMEDIUM;
         }
-        mmc_start_request(host, mrq);
 
-        return 0;
+        return err;
 }
 
 static int __mmc_start_req(struct mmc_host *host, struct mmc_request *mrq)
 {
+        int err;
+
         init_completion(&mrq->completion);
         mrq->done = mmc_wait_done;
-        if (mmc_card_removed(host->card)) {
-                mrq->cmd->error = -ENOMEDIUM;
+
+        err = mmc_start_request(host, mrq);
+        if (err) {
+                mrq->cmd->error = err;
                 complete(&mrq->completion);
-                return -ENOMEDIUM;
         }
-        mmc_start_request(host, mrq);
-        return 0;
+
+        return err;
 }
 
 /*
@@ -1077,6 +1086,30 @@ void mmc_set_ungated(struct mmc_host *host)
 }
 #endif
 
+int mmc_execute_tuning(struct mmc_card *card)
+{
+        struct mmc_host *host = card->host;
+        u32 opcode;
+        int err;
+
+        if (!host->ops->execute_tuning)
+                return 0;
+
+        if (mmc_card_mmc(card))
+                opcode = MMC_SEND_TUNING_BLOCK_HS200;
+        else
+                opcode = MMC_SEND_TUNING_BLOCK;
+
+        mmc_host_clk_hold(host);
+        err = host->ops->execute_tuning(host, opcode);
+        mmc_host_clk_release(host);
+
+        if (err)
+                pr_err("%s: tuning execution failed\n", mmc_hostname(host));
+
+        return err;
+}
+
 /*
  * Change the bus mode (open drain/push-pull) of a host.
  */
@@ -1232,6 +1265,34 @@ EXPORT_SYMBOL(mmc_of_parse_voltage);
 
 #endif /* CONFIG_OF */
 
+static int mmc_of_get_func_num(struct device_node *node)
+{
+        u32 reg;
+        int ret;
+
+        ret = of_property_read_u32(node, "reg", &reg);
+        if (ret < 0)
+                return ret;
+
+        return reg;
+}
+
+struct device_node *mmc_of_find_child_device(struct mmc_host *host,
+                unsigned func_num)
+{
+        struct device_node *node;
+
+        if (!host->parent || !host->parent->of_node)
+                return NULL;
+
+        for_each_child_of_node(host->parent->of_node, node) {
+                if (mmc_of_get_func_num(node) == func_num)
+                        return node;
+        }
+
+        return NULL;
+}
+
 #ifdef CONFIG_REGULATOR
 
 /**
@@ -1555,6 +1616,8 @@ void mmc_power_up(struct mmc_host *host, u32 ocr)
 
         mmc_host_clk_hold(host);
 
+        mmc_pwrseq_pre_power_on(host);
+
         host->ios.vdd = fls(ocr) - 1;
         host->ios.power_mode = MMC_POWER_UP;
         /* Set initial state and call mmc_set_ios */
@@ -1574,6 +1637,8 @@ void mmc_power_up(struct mmc_host *host, u32 ocr)
          */
         mmc_delay(10);
 
+        mmc_pwrseq_post_power_on(host);
+
         host->ios.clock = host->f_init;
 
         host->ios.power_mode = MMC_POWER_ON;
@@ -1595,6 +1660,8 @@ void mmc_power_off(struct mmc_host *host)
 
         mmc_host_clk_hold(host);
 
+        mmc_pwrseq_power_off(host);
+
         host->ios.clock = 0;
         host->ios.vdd = 0;
 
@@ -2245,67 +2312,28 @@ static void mmc_hw_reset_for_init(struct mmc_host *host)
         mmc_host_clk_release(host);
 }
 
-int mmc_can_reset(struct mmc_card *card)
-{
-        u8 rst_n_function;
-
-        if (!mmc_card_mmc(card))
-                return 0;
-        rst_n_function = card->ext_csd.rst_n_function;
-        if ((rst_n_function & EXT_CSD_RST_N_EN_MASK) != EXT_CSD_RST_N_ENABLED)
-                return 0;
-        return 1;
-}
-EXPORT_SYMBOL(mmc_can_reset);
-
-static int mmc_do_hw_reset(struct mmc_host *host, int check)
+int mmc_hw_reset(struct mmc_host *host)
 {
-        struct mmc_card *card = host->card;
-
-        if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
-                return -EOPNOTSUPP;
+        int ret;
 
-        if (!card)
+        if (!host->card)
                 return -EINVAL;
 
-        if (!mmc_can_reset(card))
+        mmc_bus_get(host);
+        if (!host->bus_ops || host->bus_dead || !host->bus_ops->reset) {
+                mmc_bus_put(host);
                 return -EOPNOTSUPP;
-
-        mmc_host_clk_hold(host);
-        mmc_set_clock(host, host->f_init);
-
-        host->ops->hw_reset(host);
-
-        /* If the reset has happened, then a status command will fail */
-        if (check) {
-                u32 status;
-
-                if (!mmc_send_status(card, &status)) {
-                        mmc_host_clk_release(host);
-                        return -ENOSYS;
-                }
         }
 
-        /* Set initial state and call mmc_set_ios */
-        mmc_set_initial_state(host);
+        ret = host->bus_ops->reset(host);
+        mmc_bus_put(host);
 
-        mmc_host_clk_release(host);
+        pr_warn("%s: tried to reset card\n", mmc_hostname(host));
 
-        return host->bus_ops->power_restore(host);
-}
-
-int mmc_hw_reset(struct mmc_host *host)
-{
-        return mmc_do_hw_reset(host, 0);
+        return ret;
 }
 EXPORT_SYMBOL(mmc_hw_reset);
 
-int mmc_hw_reset_check(struct mmc_host *host)
-{
-        return mmc_do_hw_reset(host, 1);
-}
-EXPORT_SYMBOL(mmc_hw_reset_check);
-
 static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
 {
         host->f_init = freq;