summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-13 16:52:07 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-10-12 21:56:02 +0100
commitf3683bc6dd0c13bf0faaedbec4cfee157d985c2b (patch)
tree9c54e623361faf8fa435a841295170ebf64943fd
parentb20384ef35b95172e9680a0ae6cb7430fd9d6d1f (diff)
ARM: sa1111: use parent clock rate
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/common/sa1111.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index c98ebae1aeac..6d0f553d1a2a 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1183,6 +1183,7 @@ static unsigned char opdiv_table[] = { 1, 4, 2, 8 };
static unsigned int __sa1111_pll_clock(struct sa1111 *sachip)
{
+ unsigned long rate = clk_get_rate(sachip->clk);
unsigned int skcdr, fbdiv, ipdiv, opdiv;
skcdr = readl_relaxed(sachip->base + SA1111_SKCDR);
@@ -1191,7 +1192,7 @@ static unsigned int __sa1111_pll_clock(struct sa1111 *sachip)
ipdiv = ((skcdr & 0x0f80) >> 7) + 2;
opdiv = opdiv_table[(skcdr & 0x3000) >> 12];
- return 3686400 * fbdiv / (ipdiv * opdiv);
+ return rate * fbdiv / (ipdiv * opdiv);
}
/**