The patch titled
tmio_mmc: optionally support using platform clock
has been added to the -mm tree. Its filename is
tmio_mmc-optionally-support-using-platform-clock.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: tmio_mmc: optionally support using platform clock
From: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
If the platform device has a clock associated with the tmio-mmc device,
use it.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Cc: Magnus Damm <damm@xxxxxxxxxxxxx>
Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxx>
Cc: Ian Molton <ian@xxxxxxxxxxxxxx>
Cc: "Roberto A. Foglietta" <roberto.foglietta@xxxxxxxxx>
Cc: Philip Langdale <philipl@xxxxxxxxx>
Cc: Pierre Ossman <pierre@xxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: pHilipp Zabel <philipp.zabel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/host/tmio_mmc.c | 21 +++++++++++++++++++++
drivers/mmc/host/tmio_mmc.h | 3 +++
include/linux/mfd/tmio.h | 1 +
3 files changed, 25 insertions(+)
diff -puN drivers/mmc/host/tmio_mmc.c~tmio_mmc-optionally-support-using-platform-clock drivers/mmc/host/tmio_mmc.c
--- a/drivers/mmc/host/tmio_mmc.c~tmio_mmc-optionally-support-using-platform-clock
+++ a/drivers/mmc/host/tmio_mmc.c
@@ -32,6 +32,7 @@
#include <linux/mmc/host.h>
#include <linux/mfd/core.h>
#include <linux/mfd/tmio.h>
+#include <linux/clk.h>
#include "tmio_mmc.h"
@@ -57,10 +58,18 @@ static void tmio_mmc_clk_stop(struct tmi
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~0x0100 &
sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
msleep(10);
+ if (!IS_ERR(host->clk) && host->clk_is_running) {
+ clk_disable(host->clk);
+ host->clk_is_running = false;
+ }
}
static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
{
+ if (!IS_ERR(host->clk) && !host->clk_is_running &&
+ !clk_enable(host->clk))
+ host->clk_is_running = true;
+
sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |
sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
msleep(10);
@@ -567,6 +576,11 @@ static int __devinit tmio_mmc_probe(stru
goto unmap_cnf;
}
+ host->clk = clk_get(&dev->dev, pdata->clk_name);
+
+ if (!IS_ERR(host->clk) && !clk_enable(host->clk))
+ host->clk_is_running = true;
+
/* Enable the MMC/SD Control registers */
sd_config_write16(host, CNF_CMD, SDCREN);
sd_config_write32(host, CNF_CTL_BASE,
@@ -608,6 +622,11 @@ static int __devinit tmio_mmc_probe(stru
return 0;
unmap_cnf:
+ if (!IS_ERR(host->clk)) {
+ clk_disable(host->clk);
+ host->clk_is_running = false;
+ clk_put(host->clk);
+ }
if (host->cnf)
iounmap(host->cnf);
unmap_ctl:
@@ -632,6 +651,8 @@ static int __devexit tmio_mmc_remove(str
if (host->cnf)
iounmap(host->cnf);
mmc_free_host(mmc);
+ if (!IS_ERR(host->clk))
+ clk_put(host->clk);
}
return 0;
diff -puN drivers/mmc/host/tmio_mmc.h~tmio_mmc-optionally-support-using-platform-clock drivers/mmc/host/tmio_mmc.h
--- a/drivers/mmc/host/tmio_mmc.h~tmio_mmc-optionally-support-using-platform-clock
+++ a/drivers/mmc/host/tmio_mmc.h
@@ -108,6 +108,7 @@
sd_ctrl_write32((host), CTL_STATUS, mask); \
} while (0)
+struct clk;
struct tmio_mmc_host {
void __iomem *cnf;
@@ -117,6 +118,8 @@ struct tmio_mmc_host {
struct mmc_request *mrq;
struct mmc_data *data;
struct mmc_host *mmc;
+ struct clk *clk;
+ bool clk_is_running;
int irq;
/* pio related stuff */
diff -puN include/linux/mfd/tmio.h~tmio_mmc-optionally-support-using-platform-clock include/linux/mfd/tmio.h
--- a/include/linux/mfd/tmio.h~tmio_mmc-optionally-support-using-platform-clock
+++ a/include/linux/mfd/tmio.h
@@ -23,6 +23,7 @@
*/
struct tmio_mmc_data {
const unsigned int hclk;
+ const char *clk_name;
};
/*
_
Patches currently in -mm which might be from g.liakhovetski@xxxxxx are
linux-next.patch
imx31-fix-framebuffer-locking-regressions.patch
mmc-make-the-configuration-memory-resource-optional.patch
tmio_mmc-optionally-support-using-platform-clock.patch
sh-switch-migo-r-to-use-the-tmio-mmc-driver-instead-of-spi.patch
spi-remove-imx-spi-driver.patch
spi-add-spi-driver-for-most-known-imx-socs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
