Re: [PATCH V3 28/30] omap_hsmmc: ensure all clock enables and disables are paired

2009-09-11 Thread Adrian Hunter 

Andrew Morton wrote:

On Wed, 09 Sep 2009 15:00:03 +0300
Adrian Hunter adrian.hun...@nokia.com wrote:


From baf6574a1b5e7c4fdc4a66d9e038efeee75ea1a0 Mon Sep 17 00:00:00 2001
From: Adrian Hunter adrian.hun...@nokia.com
Date: Sun, 31 May 2009 19:27:36 +0300
Subject: [PATCH] omap_hsmmc: ensure all clock enables and disables are paired



This patch hasn't been updated with
omap_hsmmc-ensure-all-clock-enables-and-disables-are-paired-fix-for-the-db-clock-failure-message.patch,
and
omap_hsmmc-ensure-all-clock-enables-and-disables-are-paired-fix-for-the-db-clock-failure-message.patch
is not present in the v3 patchset.  What's up with that?


I am not sure what you want here.  madhu's patch should apply cleanly on top of 
the ones I sent.




I went through the patchset seeing what you'd done.

mmc-add-host-capabilities-for-sd-only-and-mmc-only.patch and
omap_hsmmc-pass-host-capabilities-for-sd-only-and-mmc-only.patch were
dropped.

arm-omap-rx51-set-mmc-capabilities-and-power-saving-flag.patch was
significantly altered (I queued a delta for that).

omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability.patch
was changed a bit to fix rejects (I think).


Yes that is right.
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH V3 28/30] omap_hsmmc: ensure all clock enables and disables are paired

2009-09-10 Thread Andrew Morton 
On Wed, 09 Sep 2009 15:00:03 +0300
Adrian Hunter adrian.hun...@nokia.com wrote:

 From baf6574a1b5e7c4fdc4a66d9e038efeee75ea1a0 Mon Sep 17 00:00:00 2001
 From: Adrian Hunter adrian.hun...@nokia.com
 Date: Sun, 31 May 2009 19:27:36 +0300
 Subject: [PATCH] omap_hsmmc: ensure all clock enables and disables are paired
 

This patch hasn't been updated with
omap_hsmmc-ensure-all-clock-enables-and-disables-are-paired-fix-for-the-db-clock-failure-message.patch,
and
omap_hsmmc-ensure-all-clock-enables-and-disables-are-paired-fix-for-the-db-clock-failure-message.patch
is not present in the v3 patchset.  What's up with that?


I went through the patchset seeing what you'd done.

mmc-add-host-capabilities-for-sd-only-and-mmc-only.patch and
omap_hsmmc-pass-host-capabilities-for-sd-only-and-mmc-only.patch were
dropped.

arm-omap-rx51-set-mmc-capabilities-and-power-saving-flag.patch was
significantly altered (I queued a delta for that).

omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability.patch
was changed a bit to fix rejects (I think).

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH V3 28/30] omap_hsmmc: ensure all clock enables and disables are paired

2009-09-09 Thread Adrian Hunter 
From baf6574a1b5e7c4fdc4a66d9e038efeee75ea1a0 Mon Sep 17 00:00:00 2001
From: Adrian Hunter adrian.hun...@nokia.com
Date: Sun, 31 May 2009 19:27:36 +0300
Subject: [PATCH] omap_hsmmc: ensure all clock enables and disables are paired

Signed-off-by: Adrian Hunter adrian.hun...@nokia.com
---
 drivers/mmc/host/omap_hsmmc.c |   26 ++
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 047e656..64780da 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -735,22 +735,24 @@ static int omap_hsmmc_switch_opcond(struct 
omap_hsmmc_host *host, int vdd)
/* Disable the clocks */
clk_disable(host-fclk);
clk_disable(host-iclk);
-   clk_disable(host-dbclk);
+   if (host-dbclk_enabled)
+   clk_disable(host-dbclk);
 
/* Turn the power off */
ret = mmc_slot(host).set_power(host-dev, host-slot_id, 0, 0);
-   if (ret != 0)
-   goto err;
 
/* Turn the power ON with given VDD 1.8 or 3.0v */
-   ret = mmc_slot(host).set_power(host-dev, host-slot_id, 1, vdd);
+   if (!ret)
+   ret = mmc_slot(host).set_power(host-dev, host-slot_id, 1,
+  vdd);
+   clk_enable(host-iclk);
+   if (host-dbclk_enabled)
+   clk_enable(host-dbclk);
+   clk_enable(host-fclk);
+
if (ret != 0)
goto err;
 
-   clk_enable(host-fclk);
-   clk_enable(host-iclk);
-   clk_enable(host-dbclk);
-
OMAP_HSMMC_WRITE(host-base, HCTL,
OMAP_HSMMC_READ(host-base, HCTL)  SDVSCLR);
reg_val = OMAP_HSMMC_READ(host-base, HCTL);
@@ -1898,7 +1900,8 @@ static int omap_hsmmc_suspend(struct platform_device 
*pdev, pm_message_t state)
OMAP_HSMMC_READ(host-base, HCTL)  ~SDBP);
mmc_host_disable(host-mmc);
clk_disable(host-iclk);
-   clk_disable(host-dbclk);
+   if (host-dbclk_enabled)
+   clk_disable(host-dbclk);
} else {
host-suspended = 0;
if (host-pdata-resume) {
@@ -1929,9 +1932,8 @@ static int omap_hsmmc_resume(struct platform_device *pdev)
if (ret)
goto clk_en_err;
 
-   if (clk_enable(host-dbclk) != 0)
-   dev_dbg(mmc_dev(host-mmc),
-   Enabling debounce clk failed\n);
+   if (host-dbclk_enabled)
+   clk_enable(host-dbclk);
 
if (mmc_host_enable(host-mmc) != 0) {
clk_disable(host-iclk);
-- 
1.5.6.3

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html