Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[pandora-kernel.git] / arch / arm / mach-tcc8k / clock.c

diff --git a/arch/arm/mach-tcc8k/clock.c b/arch/arm/mach-tcc8k/clock.c
index a25e3fc..e7cdae5 100644 (file)
--- a/arch/arm/mach-tcc8k/clock.c
+++ b/arch/arm/mach-tcc8k/clock.c
@@ -45,7 +45,6 @@
 #define ACLKGSB1       (CKC_BASE + ACLKGSB1_OFFS)
 #define ACLKGSB2       (CKC_BASE + ACLKGSB2_OFFS)
 #define ACLKGSB3       (CKC_BASE + ACLKGSB3_OFFS)
-#define ACLKUSBH       (CKC_BASE + ACLKUSBH_OFFS)
 #define ACLKTCT                (CKC_BASE + ACLKTCT_OFFS)
 #define ACLKTCX                (CKC_BASE + ACLKTCX_OFFS)
 #define ACLKTCZ                (CKC_BASE + ACLKTCZ_OFFS)
@@ -108,9 +107,9 @@ static int root_clk_enable(enum root_clks src)
        return 0;
 }
 
-static int root_clk_disable(enum root_clks root_src)
+static int root_clk_disable(enum root_clks src)
 {
-       switch (root_src) {
+       switch (src) {
        case CLK_SRC_PLL0: return pll_enable(0, 0);
        case CLK_SRC_PLL1: return pll_enable(1, 0);
        case CLK_SRC_PLL2: return pll_enable(2, 0);
@@ -304,15 +303,22 @@ static unsigned long get_rate_sys(struct clk *clk)
        unsigned int src;
 
        src = __raw_readl(CKC_BASE + CLKCTRL_OFFS) & CLK_SRC_MASK;
-               return root_clk_get_rate(src);
+       return root_clk_get_rate(src);
 }
 
 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)