From: Shawn Lin <shawn.lin@rock-chips.com>
To: Jaehoon Chung <jh80.chung@samsung.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: [PATCH 2/4] mmc: dw_mmc: add setup_clk for init hook
Date: Thu, 28 Jan 2016 09:31:04 +0800 [thread overview]
Message-ID: <1453944664-16874-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1453944616-16224-1-git-send-email-shawn.lin@rock-chips.com>
We add this new argument into init hook for
variant drivers to decide whether to do clock
related stuff inside the hook.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/dw_mmc-exynos.c | 4 ++--
drivers/mmc/host/dw_mmc-rockchip.c | 2 +-
drivers/mmc/host/dw_mmc.c | 2 +-
drivers/mmc/host/dw_mmc.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 3a7e835..edaa117 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -91,7 +91,7 @@ static inline u8 dw_mci_exynos_get_ciu_div(struct dw_mci *host)
return SDMMC_CLKSEL_GET_DIV(mci_readl(host, CLKSEL)) + 1;
}
-static int dw_mci_exynos_priv_init(struct dw_mci *host)
+static int dw_mci_exynos_priv_init(struct dw_mci *host, bool setup_clk)
{
struct dw_mci_exynos_priv_data *priv = host->priv;
@@ -159,7 +159,7 @@ static int dw_mci_exynos_resume(struct device *dev)
{
struct dw_mci *host = dev_get_drvdata(dev);
- dw_mci_exynos_priv_init(host);
+ dw_mci_exynos_priv_init(host, false);
return dw_mci_resume(host);
}
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 9934503..885c801 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -221,7 +221,7 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
return 0;
}
-static int dw_mci_rockchip_init(struct dw_mci *host)
+static int dw_mci_rockchip_init(struct dw_mci *host, bool setup_clk)
{
/* It is slot 8 on Rockchip SoCs */
host->sdio_id0 = 8;
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 7128351..1d27a2b 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2995,7 +2995,7 @@ int dw_mci_probe(struct dw_mci *host)
}
if (drv_data && drv_data->init) {
- ret = drv_data->init(host);
+ ret = drv_data->init(host, true);
if (ret) {
dev_err(host->dev,
"implementation specific init failed\n");
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index f695b58..1a9492e 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -285,7 +285,7 @@ struct dw_mci_slot {
*/
struct dw_mci_drv_data {
unsigned long *caps;
- int (*init)(struct dw_mci *host);
+ int (*init)(struct dw_mci *host, bool setup_clk);
int (*setup_clock)(struct dw_mci *host);
void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
--
2.3.7
next prev parent reply other threads:[~2016-01-28 1:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 1:30 [PATCH 0/4] Cleanup setup_clock callback from dw_mmc Shawn Lin
2016-01-28 1:30 ` [PATCH 1/4] mmc: dw_mmc-rockchip: remove setup_clock for rockchip Shawn Lin
2016-01-28 1:31 ` Shawn Lin [this message]
2016-02-04 6:04 ` [PATCH 2/4] mmc: dw_mmc: add setup_clk for init hook Jaehoon Chung
2016-02-12 11:30 ` Shawn Lin
2016-01-28 1:31 ` [PATCH 3/4] mmc: dw_mmc-exynos: remove dw_mci_exynos_setup_clock Shawn Lin
2016-01-28 1:31 ` [PATCH 4/4] mmc: dw_mmc: remove setup_clock callback Shawn Lin
2016-03-31 6:38 ` Jaehoon Chung
2016-03-31 6:37 ` [PATCH 0/4] Cleanup setup_clock callback from dw_mmc Jaehoon Chung
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453944664-16874-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=jh80.chung@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®