Merge branch 'sh/dmaengine'

[deliverable/linux.git] / arch / sh / kernel / cpu / sh3 / clock-sh7705.c

diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7705.c b/arch/sh/kernel/cpu/sh3/clock-sh7705.c
index 0ca8f2c3646c558be6bbf8c9da0ed64cc25e2b54..0ecea1451c6f079db7c0e9856c83077589d6353a 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/clock-sh7705.c
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7705.c
@@ -32,7 +32,7 @@ static int pfc_divisors[]    = { 1, 2, 3, 4, 6, 1, 1, 1 };
 
 static void master_clk_init(struct clk *clk)
 {
-       clk->rate *= pfc_divisors[ctrl_inw(FRQCR) & 0x0003];
+       clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0003];
 }
 
 static struct clk_ops sh7705_master_clk_ops = {
@@ -41,7 +41,7 @@ static struct clk_ops sh7705_master_clk_ops = {
 
 static unsigned long module_clk_recalc(struct clk *clk)
 {
-       int idx = ctrl_inw(FRQCR) & 0x0003;
+       int idx = __raw_readw(FRQCR) & 0x0003;
        return clk->parent->rate / pfc_divisors[idx];
 }
 
@@ -51,7 +51,7 @@ static struct clk_ops sh7705_module_clk_ops = {
 
 static unsigned long bus_clk_recalc(struct clk *clk)
 {
-       int idx = (ctrl_inw(FRQCR) & 0x0300) >> 8;
+       int idx = (__raw_readw(FRQCR) & 0x0300) >> 8;
        return clk->parent->rate / stc_multipliers[idx];
 }
 
@@ -61,7 +61,7 @@ static struct clk_ops sh7705_bus_clk_ops = {
 
 static unsigned long cpu_clk_recalc(struct clk *clk)
 {
-       int idx = (ctrl_inw(FRQCR) & 0x0030) >> 4;
+       int idx = (__raw_readw(FRQCR) & 0x0030) >> 4;
        return clk->parent->rate / ifc_divisors[idx];
 }