diff options
| author |   Oskar Schirmer <oskar@linutronix.de> | 2011-02-17 16:43:02 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2011-03-11 10:06:06 +0100 |
| commit | f91f9cd505f92e4227ffda7e5799a33d4f34bf36 (patch) | |
| tree | 94df64adc3e9c439a1b63725a0f34d88a1a30086 /arch/arm/mach-tcc8k | |
| parent | arm: tcc8k: Fix indent, coding syle (diff) | |
| download | linux-dev-f91f9cd505f92e4227ffda7e5799a33d4f34bf36.tar.xz linux-dev-f91f9cd505f92e4227ffda7e5799a33d4f34bf36.zip | |
arm: tcc8k: Fix bus clock calculation
There are two dividers used to derive bus clock from system clock:
system clock is divided by SCKDIV+1, then by BCKDIV+1. SCKDIV divider
has been ignored up to now, which is no problem as long as it is 0.
Take SCKDIV into account for bus clock calculation.
Signed-off-by: Oskar Schirmer <oskar@linutronix.de>
Cc: bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-tcc8k')
| -rw-r--r-- | arch/arm/mach-tcc8k/clock.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-tcc8k/clock.c b/arch/arm/mach-tcc8k/clock.c index 8d8c99f89558..e7cdae5c77a4 100644 --- a/arch/arm/mach-tcc8k/clock.c +++ b/arch/arm/mach-tcc8k/clock.c @@ -308,10 +308,17 @@ static unsigned long get_rate_sys(struct clk *clk) static unsigned long get_rate_bus(struct clk *clk) { - unsigned int div; + unsigned int reg, sdiv, bdiv, rate; - div = (__raw_readl(CKC_BASE + CLKCTRL_OFFS) >> 4) & 0xff; - return get_rate_sys(clk) / (div + 1); + reg = __raw_readl(CKC_BASE + CLKCTRL_OFFS); + rate = get_rate_sys(clk); + sdiv = (reg >> 20) & 3; + if (sdiv) + rate /= sdiv + 1; + bdiv = (reg >> 4) & 0xff; + if (bdiv) + rate /= bdiv + 1; + return rate; } static unsigned long get_rate_cpu(struct clk *clk) |