diff options
Diffstat (limited to 'arch/sh/kernel/cpu/sh3/clock-sh7705.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh3/clock-sh7705.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7705.c b/arch/sh/kernel/cpu/sh3/clock-sh7705.c index 0ca8f2c3646c..0ecea1451c6f 100644 --- 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 }; | |||
| 32 | 32 | ||
| 33 | static void master_clk_init(struct clk *clk) | 33 | static void master_clk_init(struct clk *clk) |
| 34 | { | 34 | { |
| 35 | clk->rate *= pfc_divisors[ctrl_inw(FRQCR) & 0x0003]; | 35 | clk->rate *= pfc_divisors[__raw_readw(FRQCR) & 0x0003]; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | static struct clk_ops sh7705_master_clk_ops = { | 38 | static struct clk_ops sh7705_master_clk_ops = { |
| @@ -41,7 +41,7 @@ static struct clk_ops sh7705_master_clk_ops = { | |||
| 41 | 41 | ||
| 42 | static unsigned long module_clk_recalc(struct clk *clk) | 42 | static unsigned long module_clk_recalc(struct clk *clk) |
| 43 | { | 43 | { |
| 44 | int idx = ctrl_inw(FRQCR) & 0x0003; | 44 | int idx = __raw_readw(FRQCR) & 0x0003; |
| 45 | return clk->parent->rate / pfc_divisors[idx]; | 45 | return clk->parent->rate / pfc_divisors[idx]; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| @@ -51,7 +51,7 @@ static struct clk_ops sh7705_module_clk_ops = { | |||
| 51 | 51 | ||
| 52 | static unsigned long bus_clk_recalc(struct clk *clk) | 52 | static unsigned long bus_clk_recalc(struct clk *clk) |
| 53 | { | 53 | { |
| 54 | int idx = (ctrl_inw(FRQCR) & 0x0300) >> 8; | 54 | int idx = (__raw_readw(FRQCR) & 0x0300) >> 8; |
| 55 | return clk->parent->rate / stc_multipliers[idx]; | 55 | return clk->parent->rate / stc_multipliers[idx]; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| @@ -61,7 +61,7 @@ static struct clk_ops sh7705_bus_clk_ops = { | |||
| 61 | 61 | ||
| 62 | static unsigned long cpu_clk_recalc(struct clk *clk) | 62 | static unsigned long cpu_clk_recalc(struct clk *clk) |
| 63 | { | 63 | { |
| 64 | int idx = (ctrl_inw(FRQCR) & 0x0030) >> 4; | 64 | int idx = (__raw_readw(FRQCR) & 0x0030) >> 4; |
| 65 | return clk->parent->rate / ifc_divisors[idx]; | 65 | return clk->parent->rate / ifc_divisors[idx]; |
| 66 | } | 66 | } |
| 67 | 67 | ||
