Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
  mmc: add new sdhci-pxa driver for Marvell SoCs
  mmc: make number of mmcblk minors configurable
  mmc_spi: Recover from CRC errors for r/w operation over SPI.
  mmc: sdhci-pltfm: add -pltfm driver for imx35/51
  mmc: sdhci-of-esdhc: factor out common stuff
  mmc: sdhci_pltfm: pass more data on custom init call
  mmc: sdhci: introduce get_ro private write-protect hook
  mmc: sdhci-pltfm: move .h file into appropriate subdir
  mmc: sdhci-pltfm: Add structure for host-specific data
  mmc: fix cb710 kconfig dependency warning
  mmc: cb710: remove debugging printk (info duplicated from mmc-core)
  mmc: cb710: clear irq handler on init() error path
  mmc: cb710: remove unnecessary msleep()
  mmc: cb710: implement get_cd() callback
  mmc: cb710: partially demystify clock selection
  mmc: add a file to debugfs for changing host clock at runtime
  mmc: sdhci: allow for eMMC 74 clock generation by controller
  mmc: sdhci: highspeed: check for mmc as well as sd cards
  mmc: sdhci: Add Moorestown device support
  mmc: sdhci: Intel Medfield support
  ...

1 files changed, 33 insertions, 2 deletions

diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 46bc6d7551a3..eed1405fd742 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -134,6 +134,33 @@ static const struct file_operations mmc_ios_fops = {
         .release        = single_release,
 };
 
+static int mmc_clock_opt_get(void *data, u64 *val)
+{
+        struct mmc_host *host = data;
+
+        *val = host->ios.clock;
+
+        return 0;
+}
+
+static int mmc_clock_opt_set(void *data, u64 val)
+{
+        struct mmc_host *host = data;
+
+        /* We need this check due to input value is u64 */
+        if (val > host->f_max)
+                return -EINVAL;
+
+        mmc_claim_host(host);
+        mmc_set_clock(host, (unsigned int) val);
+        mmc_release_host(host);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(mmc_clock_fops, mmc_clock_opt_get, mmc_clock_opt_set,
+        "%llu\n");
+
 void mmc_add_host_debugfs(struct mmc_host *host)
 {
         struct dentry *root;
@@ -150,11 +177,15 @@ void mmc_add_host_debugfs(struct mmc_host *host)
         host->debugfs_root = root;
 
         if (!debugfs_create_file("ios", S_IRUSR, root, host, &mmc_ios_fops))
-                goto err_ios;
+                goto err_node;
+
+        if (!debugfs_create_file("clock", S_IRUSR | S_IWUSR, root, host,
+                        &mmc_clock_fops))
+                goto err_node;
 
         return;
 
-err_ios:
+err_node:
         debugfs_remove_recursive(root);
         host->debugfs_root = NULL;
 err_root: