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, 145 insertions, 0 deletions

diff --git a/drivers/mmc/core/pwrseq_simple.c b/drivers/mmc/core/pwrseq_simple.c
new file mode 100644
index 000000000000..e9f1d8d84613
--- /dev/null
+++ b/drivers/mmc/core/pwrseq_simple.c
@@ -0,0 +1,145 @@
+/*
+ *  Copyright (C) 2014 Linaro Ltd
+ *
+ * Author: Ulf Hansson <ulf.hansson@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ *
+ *  Simple MMC power sequence management
+ */
+#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
+
+#include <linux/mmc/host.h>
+
+#include "pwrseq.h"
+
+struct mmc_pwrseq_simple {
+        struct mmc_pwrseq pwrseq;
+        bool clk_enabled;
+        struct clk *ext_clk;
+        int nr_gpios;
+        struct gpio_desc *reset_gpios[0];
+};
+
+static void mmc_pwrseq_simple_set_gpios_value(struct mmc_pwrseq_simple *pwrseq,
+                                              int value)
+{
+        int i;
+
+        for (i = 0; i < pwrseq->nr_gpios; i++)
+                if (!IS_ERR(pwrseq->reset_gpios[i]))
+                        gpiod_set_value_cansleep(pwrseq->reset_gpios[i], value);
+}
+
+static void mmc_pwrseq_simple_pre_power_on(struct mmc_host *host)
+{
+        struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
+                                        struct mmc_pwrseq_simple, pwrseq);
+
+        if (!IS_ERR(pwrseq->ext_clk) && !pwrseq->clk_enabled) {
+                clk_prepare_enable(pwrseq->ext_clk);
+                pwrseq->clk_enabled = true;
+        }
+
+        mmc_pwrseq_simple_set_gpios_value(pwrseq, 1);
+}
+
+static void mmc_pwrseq_simple_post_power_on(struct mmc_host *host)
+{
+        struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
+                                        struct mmc_pwrseq_simple, pwrseq);
+
+        mmc_pwrseq_simple_set_gpios_value(pwrseq, 0);
+}
+
+static void mmc_pwrseq_simple_power_off(struct mmc_host *host)
+{
+        struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
+                                        struct mmc_pwrseq_simple, pwrseq);
+
+        mmc_pwrseq_simple_set_gpios_value(pwrseq, 1);
+
+        if (!IS_ERR(pwrseq->ext_clk) && pwrseq->clk_enabled) {
+                clk_disable_unprepare(pwrseq->ext_clk);
+                pwrseq->clk_enabled = false;
+        }
+}
+
+static void mmc_pwrseq_simple_free(struct mmc_host *host)
+{
+        struct mmc_pwrseq_simple *pwrseq = container_of(host->pwrseq,
+                                        struct mmc_pwrseq_simple, pwrseq);
+        int i;
+
+        for (i = 0; i < pwrseq->nr_gpios; i++)
+                if (!IS_ERR(pwrseq->reset_gpios[i]))
+                        gpiod_put(pwrseq->reset_gpios[i]);
+
+        if (!IS_ERR(pwrseq->ext_clk))
+                clk_put(pwrseq->ext_clk);
+
+        kfree(pwrseq);
+        host->pwrseq = NULL;
+}
+
+static struct mmc_pwrseq_ops mmc_pwrseq_simple_ops = {
+        .pre_power_on = mmc_pwrseq_simple_pre_power_on,
+        .post_power_on = mmc_pwrseq_simple_post_power_on,
+        .power_off = mmc_pwrseq_simple_power_off,
+        .free = mmc_pwrseq_simple_free,
+};
+
+int mmc_pwrseq_simple_alloc(struct mmc_host *host, struct device *dev)
+{
+        struct mmc_pwrseq_simple *pwrseq;
+        int i, nr_gpios, ret = 0;
+
+        nr_gpios = of_gpio_named_count(dev->of_node, "reset-gpios");
+        if (nr_gpios < 0)
+                nr_gpios = 0;
+
+        pwrseq = kzalloc(sizeof(struct mmc_pwrseq_simple) + nr_gpios *
+                         sizeof(struct gpio_desc *), GFP_KERNEL);
+        if (!pwrseq)
+                return -ENOMEM;
+
+        pwrseq->ext_clk = clk_get(dev, "ext_clock");
+        if (IS_ERR(pwrseq->ext_clk) &&
+            PTR_ERR(pwrseq->ext_clk) != -ENOENT) {
+                ret = PTR_ERR(pwrseq->ext_clk);
+                goto free;
+        }
+
+        for (i = 0; i < nr_gpios; i++) {
+                pwrseq->reset_gpios[i] = gpiod_get_index(dev, "reset", i,
+                                                         GPIOD_OUT_HIGH);
+                if (IS_ERR(pwrseq->reset_gpios[i]) &&
+                    PTR_ERR(pwrseq->reset_gpios[i]) != -ENOENT &&
+                    PTR_ERR(pwrseq->reset_gpios[i]) != -ENOSYS) {
+                        ret = PTR_ERR(pwrseq->reset_gpios[i]);
+
+                        while (--i)
+                                gpiod_put(pwrseq->reset_gpios[i]);
+
+                        goto clk_put;
+                }
+        }
+
+        pwrseq->nr_gpios = nr_gpios;
+        pwrseq->pwrseq.ops = &mmc_pwrseq_simple_ops;
+        host->pwrseq = &pwrseq->pwrseq;
+
+        return 0;
+clk_put:
+        if (!IS_ERR(pwrseq->ext_clk))
+                clk_put(pwrseq->ext_clk);
+free:
+        kfree(pwrseq);
+        return ret;
+}