Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

[pandora-kernel.git] / arch / sh / kernel / cpu / sh4a / clock-sh7763.c

diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
index 370cd47..9f40116 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
@@ -22,7 +22,7 @@ static int cfc_divisors[] = { 1, 1, 4, 1, 1, 1, 1, 1 };
 
 static void master_clk_init(struct clk *clk)
 {
-       clk->rate *= p0fc_divisors[(ctrl_inl(FRQCR) >> 4) & 0x07];
+       clk->rate *= p0fc_divisors[(__raw_readl(FRQCR) >> 4) & 0x07];
 }
 
 static struct clk_ops sh7763_master_clk_ops = {
@@ -31,7 +31,7 @@ static struct clk_ops sh7763_master_clk_ops = {
 
 static unsigned long module_clk_recalc(struct clk *clk)
 {
-       int idx = ((ctrl_inl(FRQCR) >> 4) & 0x07);
+       int idx = ((__raw_readl(FRQCR) >> 4) & 0x07);
        return clk->parent->rate / p0fc_divisors[idx];
 }
 
@@ -41,7 +41,7 @@ static struct clk_ops sh7763_module_clk_ops = {
 
 static unsigned long bus_clk_recalc(struct clk *clk)
 {
-       int idx = ((ctrl_inl(FRQCR) >> 16) & 0x07);
+       int idx = ((__raw_readl(FRQCR) >> 16) & 0x07);
        return clk->parent->rate / bfc_divisors[idx];
 }
 
@@ -68,7 +68,7 @@ void __init arch_init_clk_ops(struct clk_ops **ops, int idx)
 
 static unsigned long shyway_clk_recalc(struct clk *clk)
 {
-       int idx = ((ctrl_inl(FRQCR) >> 20) & 0x07);
+       int idx = ((__raw_readl(FRQCR) >> 20) & 0x07);
        return clk->parent->rate / cfc_divisors[idx];
 }