U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Steve Rae <srae@broadcom.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/4] arm: bcm235xx: update clock framework
Date: Tue, 21 Jun 2016 16:43:07 -0700	[thread overview]
Message-ID: <1466552587-9953-5-git-send-email-srae@broadcom.com> (raw)
In-Reply-To: <1466552587-9953-1-git-send-email-srae@broadcom.com>

The handling of the "usage counter" is incorrect, and the clock should
only be disabled when transitioning from 1 to 0.

Reported-by: Chris Brand <chris.brand@broadcom.com>
Signed-off-by: Steve Rae <srae@broadcom.com>
---

 arch/arm/cpu/armv7/bcm235xx/clk-core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
index 2b5da6b..a326dfe 100644
--- a/arch/arm/cpu/armv7/bcm235xx/clk-core.c
+++ b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -449,10 +449,9 @@ int clk_enable(struct clk *c)
 	if (ret)
 		return ret;
 
-	if (!c->use_cnt) {
-		c->use_cnt++;
+	if (!c->use_cnt)
 		ret = c->ops->enable(c, 1);
-	}
+	c->use_cnt++;
 
 	return ret;
 }
@@ -464,9 +463,10 @@ void clk_disable(struct clk *c)
 	if (!c->ops || !c->ops->enable)
 		return;
 
-	if (c->use_cnt) {
+	if (c->use_cnt > 0) {
 		c->use_cnt--;
-		c->ops->enable(c, 0);
+		if (c->use_cnt == 0)
+			c->ops->enable(c, 0);
 	}
 
 	/* disable parent */
-- 
1.8.5

  parent reply	other threads:[~2016-06-21 23:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21 23:43 [U-Boot] [PATCH 0/4] This series contains minor updates for the bcm23550: Steve Rae
2016-06-21 23:43 ` [U-Boot] [PATCH 1/4] arm: bcm235xx: choose 8-bit phy bus width Steve Rae
2016-06-25  2:53   ` [U-Boot] [U-Boot, " Tom Rini
2016-06-21 23:43 ` [U-Boot] [PATCH 2/4] arm: bcm235xx: implement the boot0 hook code Steve Rae
2016-06-25  2:53   ` [U-Boot] [U-Boot, " Tom Rini
2016-06-21 23:43 ` [U-Boot] [PATCH 3/4] arm: bcm235xx: fix kps ccu Steve Rae
2016-06-25  2:53   ` [U-Boot] [U-Boot,3/4] " Tom Rini
2016-06-21 23:43 ` Steve Rae [this message]
2016-06-25  2:53   ` [U-Boot] [U-Boot,4/4] arm: bcm235xx: update clock framework Tom Rini

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=1466552587-9953-5-git-send-email-srae@broadcom.com \
    --to=srae@broadcom.com \
    --cc=u-boot@lists.denx.de \
    /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