* [PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point
@ 2014-01-28 8:24 Jaehoon Chung
2014-01-28 12:54 ` Seungwon Jeon
0 siblings, 1 reply; 3+ messages in thread
From: Jaehoon Chung @ 2014-01-28 8:24 UTC (permalink / raw)
To: linux-mmc@vger.kernel.org; +Cc: Chris Ball, Seungwon Jeon
It's right that check immediately whether host->bus_hz is assigned or not.
If drv_data->setup_clock is presented, then host->bus_hz should be set at there.
When setup_clock didn't present, assigned to value with clk_get_rate().
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
Changelog V2:
- When drv_data->setup_clock is present, set to bus_hz with it.
drivers/mmc/host/dw_mmc.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 8193e21..ead2998 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2427,10 +2427,27 @@ int dw_mci_probe(struct dw_mci *host)
ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
if (ret)
dev_warn(host->dev,
- "Unable to set bus rate to %ul\n",
+ "Unable to set bus rate to %uHz\n",
host->pdata->bus_hz);
}
- host->bus_hz = clk_get_rate(host->ciu_clk);
+
+ if (drv_data && drv_data->setup_clock) {
+ ret = drv_data->setup_clock(host);
+ if (ret) {
+ dev_err(host->dev, "implementation specific \"
+ "clock setup failed\n");
+ goto err_clk_ciu;
+ }
+ } else {
+ host->bus_hz = clk_get_rate(host->ciu_clk);
+ }
+ }
+
+ if (!host->bus_hz) {
+ dev_err(host->dev,
+ "Platform data must supply bus speed\n");
+ ret = -ENODEV;
+ goto err_clk_ciu;
}
if (drv_data && drv_data->init) {
@@ -2442,15 +2459,6 @@ int dw_mci_probe(struct dw_mci *host)
}
}
- if (drv_data && drv_data->setup_clock) {
- ret = drv_data->setup_clock(host);
- if (ret) {
- dev_err(host->dev,
- "implementation specific clock setup failed\n");
- goto err_clk_ciu;
- }
- }
-
host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
if (IS_ERR(host->vmmc)) {
ret = PTR_ERR(host->vmmc);
@@ -2469,13 +2477,6 @@ int dw_mci_probe(struct dw_mci *host)
}
}
- if (!host->bus_hz) {
- dev_err(host->dev,
- "Platform data must supply bus speed\n");
- ret = -ENODEV;
- goto err_regulator;
- }
-
host->quirks = host->pdata->quirks;
spin_lock_init(&host->lock);
@@ -2619,8 +2620,6 @@ err_workqueue:
err_dmaunmap:
if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host);
-
-err_regulator:
if (host->vmmc)
regulator_disable(host->vmmc);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point
2014-01-28 8:24 [PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point Jaehoon Chung
@ 2014-01-28 12:54 ` Seungwon Jeon
2014-01-28 23:54 ` Jaehoon Chung
0 siblings, 1 reply; 3+ messages in thread
From: Seungwon Jeon @ 2014-01-28 12:54 UTC (permalink / raw)
To: 'Jaehoon Chung', linux-mmc; +Cc: 'Chris Ball'
On Tue, January 28, 2014, Jaehoon Chung wrote:
> It's right that check immediately whether host->bus_hz is assigned or not.
> If drv_data->setup_clock is presented, then host->bus_hz should be set at there.
> When setup_clock didn't present, assigned to value with clk_get_rate().
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> ---
> Changelog V2:
> - When drv_data->setup_clock is present, set to bus_hz with it.
>
> drivers/mmc/host/dw_mmc.c | 39 +++++++++++++++++++--------------------
> 1 file changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 8193e21..ead2998 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2427,10 +2427,27 @@ int dw_mci_probe(struct dw_mci *host)
> ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
> if (ret)
> dev_warn(host->dev,
> - "Unable to set bus rate to %ul\n",
> + "Unable to set bus rate to %uHz\n",
> host->pdata->bus_hz);
> }
> - host->bus_hz = clk_get_rate(host->ciu_clk);
> +
> + if (drv_data && drv_data->setup_clock) {
> + ret = drv_data->setup_clock(host);
> + if (ret) {
> + dev_err(host->dev, "implementation specific \"
> + "clock setup failed\n");
> + goto err_clk_ciu;
> + }
> + } else {
> + host->bus_hz = clk_get_rate(host->ciu_clk);
host->bus_hz certainly should be touched at drv_data->setup_clock()?
I think origin would be better.
The others is good to me.
Thanks,
Seungwon Jeon
> + }
> + }
> +
> + if (!host->bus_hz) {
> + dev_err(host->dev,
> + "Platform data must supply bus speed\n");
> + ret = -ENODEV;
> + goto err_clk_ciu;
> }
>
> if (drv_data && drv_data->init) {
> @@ -2442,15 +2459,6 @@ int dw_mci_probe(struct dw_mci *host)
> }
> }
>
> - if (drv_data && drv_data->setup_clock) {
> - ret = drv_data->setup_clock(host);
> - if (ret) {
> - dev_err(host->dev,
> - "implementation specific clock setup failed\n");
> - goto err_clk_ciu;
> - }
> - }
> -
> host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
> if (IS_ERR(host->vmmc)) {
> ret = PTR_ERR(host->vmmc);
> @@ -2469,13 +2477,6 @@ int dw_mci_probe(struct dw_mci *host)
> }
> }
>
> - if (!host->bus_hz) {
> - dev_err(host->dev,
> - "Platform data must supply bus speed\n");
> - ret = -ENODEV;
> - goto err_regulator;
> - }
> -
> host->quirks = host->pdata->quirks;
>
> spin_lock_init(&host->lock);
> @@ -2619,8 +2620,6 @@ err_workqueue:
> err_dmaunmap:
> if (host->use_dma && host->dma_ops->exit)
> host->dma_ops->exit(host);
> -
> -err_regulator:
> if (host->vmmc)
> regulator_disable(host->vmmc);
>
> --
> 1.7.9.5
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point
2014-01-28 12:54 ` Seungwon Jeon
@ 2014-01-28 23:54 ` Jaehoon Chung
0 siblings, 0 replies; 3+ messages in thread
From: Jaehoon Chung @ 2014-01-28 23:54 UTC (permalink / raw)
To: Seungwon Jeon, linux-mmc; +Cc: 'Chris Ball'
Hi Seungwon,
Thanks for review.
On 01/28/2014 09:54 PM, Seungwon Jeon wrote:
> On Tue, January 28, 2014, Jaehoon Chung wrote:
>> It's right that check immediately whether host->bus_hz is assigned or not.
>> If drv_data->setup_clock is presented, then host->bus_hz should be set at there.
>> When setup_clock didn't present, assigned to value with clk_get_rate().
>>
>> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
>> ---
>> Changelog V2:
>> - When drv_data->setup_clock is present, set to bus_hz with it.
>>
>> drivers/mmc/host/dw_mmc.c | 39 +++++++++++++++++++--------------------
>> 1 file changed, 19 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
>> index 8193e21..ead2998 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -2427,10 +2427,27 @@ int dw_mci_probe(struct dw_mci *host)
>> ret = clk_set_rate(host->ciu_clk, host->pdata->bus_hz);
>> if (ret)
>> dev_warn(host->dev,
>> - "Unable to set bus rate to %ul\n",
>> + "Unable to set bus rate to %uHz\n",
>> host->pdata->bus_hz);
>> }
>> - host->bus_hz = clk_get_rate(host->ciu_clk);
>> +
>> + if (drv_data && drv_data->setup_clock) {
>> + ret = drv_data->setup_clock(host);
>> + if (ret) {
>> + dev_err(host->dev, "implementation specific \"
>> + "clock setup failed\n");
>> + goto err_clk_ciu;
>> + }
>> + } else {
>> + host->bus_hz = clk_get_rate(host->ciu_clk);
> host->bus_hz certainly should be touched at drv_data->setup_clock()?
> I think origin would be better.
> The others is good to me.
I understood what you mean. Maybe We can change the code at dw_mmc-exynos.c.
It's refered to host->ci_clk at dw_mmc-exynos.c.
But If ciu_clk didn't assign, clk's rate didn't get.
How about this? host->bus_hz was already assigned in dw_mmc.c.
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -117,9 +117,8 @@ static int dw_mci_exynos_priv_init(struct dw_mci *host)
static int dw_mci_exynos_setup_clock(struct dw_mci *host)
{
struct dw_mci_exynos_priv_data *priv = host->priv;
- unsigned long rate = clk_get_rate(host->ciu_clk);
- host->bus_hz = rate / (priv->ciu_div + 1);
+ host->bus_hz /= (priv->ciu_div + 1);
return 0;
}
Best Regards,
Jaehoon Chung
>
> Thanks,
> Seungwon Jeon
>
>> + }
>> + }
>> +
>> + if (!host->bus_hz) {
>> + dev_err(host->dev,
>> + "Platform data must supply bus speed\n");
>> + ret = -ENODEV;
>> + goto err_clk_ciu;
>> }
>>
>> if (drv_data && drv_data->init) {
>> @@ -2442,15 +2459,6 @@ int dw_mci_probe(struct dw_mci *host)
>> }
>> }
>>
>> - if (drv_data && drv_data->setup_clock) {
>> - ret = drv_data->setup_clock(host);
>> - if (ret) {
>> - dev_err(host->dev,
>> - "implementation specific clock setup failed\n");
>> - goto err_clk_ciu;
>> - }
>> - }
>> -
>> host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
>> if (IS_ERR(host->vmmc)) {
>> ret = PTR_ERR(host->vmmc);
>> @@ -2469,13 +2477,6 @@ int dw_mci_probe(struct dw_mci *host)
>> }
>> }
>>
>> - if (!host->bus_hz) {
>> - dev_err(host->dev,
>> - "Platform data must supply bus speed\n");
>> - ret = -ENODEV;
>> - goto err_regulator;
>> - }
>> -
>> host->quirks = host->pdata->quirks;
>>
>> spin_lock_init(&host->lock);
>> @@ -2619,8 +2620,6 @@ err_workqueue:
>> err_dmaunmap:
>> if (host->use_dma && host->dma_ops->exit)
>> host->dma_ops->exit(host);
>> -
>> -err_regulator:
>> if (host->vmmc)
>> regulator_disable(host->vmmc);
>>
>> --
>> 1.7.9.5
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-28 23:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-28 8:24 [PATCH v2 3/8] mmc: dw_mmc: replace the bus_hz checking point Jaehoon Chung
2014-01-28 12:54 ` Seungwon Jeon
2014-01-28 23:54 ` Jaehoon Chung
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).