1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7706.c b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
index 4bf7887d310a..6f9ff8b57dd6 100644
--- a/arch/sh/kernel/cpu/sh3/clock-sh7706.c
+++ b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
@@ -24,7 +24,7 @@ static int pfc_divisors[]    = { 1, 2, 4, 1, 3, 6, 1, 1 };
 static void master_clk_init(struct clk *clk)
 {
-        int frqcr = ctrl_inw(FRQCR);
+        int frqcr = __raw_readw(FRQCR);
        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
        clk->rate *= pfc_divisors[idx];
@@ -36,7 +36,7 @@ static struct clk_ops sh7706_master_clk_ops = {
 static unsigned long module_clk_recalc(struct clk *clk)
 {
-        int frqcr = ctrl_inw(FRQCR);
+        int frqcr = __raw_readw(FRQCR);
        int idx = ((frqcr & 0x2000) >> 11) | (frqcr & 0x0003);
        return clk->parent->rate / pfc_divisors[idx];
@@ -48,7 +48,7 @@ static struct clk_ops sh7706_module_clk_ops = {
 static unsigned long bus_clk_recalc(struct clk *clk)
 {
-        int frqcr = ctrl_inw(FRQCR);
+        int frqcr = __raw_readw(FRQCR);
        int idx = ((frqcr & 0x8000) >> 13) | ((frqcr & 0x0030) >> 4);
        return clk->parent->rate / stc_multipliers[idx];
@@ -60,7 +60,7 @@ static struct clk_ops sh7706_bus_clk_ops = {
 static unsigned long cpu_clk_recalc(struct clk *clk)
 {
-        int frqcr = ctrl_inw(FRQCR);
+        int frqcr = __raw_readw(FRQCR);
        int idx = ((frqcr & 0x4000) >> 12) | ((frqcr & 0x000c) >> 2);
        return clk->parent->rate / ifc_divisors[idx];

diff --git a/arch/sh/kernel/cpu/sh3/clock-sh7706.c b/arch/sh/kernel/cpu/sh3/clock-sh7706.c index 4bf7887d310a..6f9ff8b57dd6 100644 --- a/arch/sh/kernel/cpu/sh3/clock-sh7706.c +++ b/arch/sh/kernel/cpu/sh3/clock-sh7706.c
@@ -24,7 +24,7 @@ static int pfc_divisors[] = { 1, 2, 4, 1, 3, 6, 1, 1 };
24		24
25	static void master_clk_init(struct clk *clk)	25	static void master_clk_init(struct clk *clk)
26	{	26	{
27	int frqcr = ctrl_inw(FRQCR);	27	int frqcr = __raw_readw(FRQCR);
28	int idx = ((frqcr & 0x2000) >> 11) \| (frqcr & 0x0003);	28	int idx = ((frqcr & 0x2000) >> 11) \| (frqcr & 0x0003);
29		29
30	clk->rate *= pfc_divisors[idx];	30	clk->rate *= pfc_divisors[idx];
@@ -36,7 +36,7 @@ static struct clk_ops sh7706_master_clk_ops = {
36		36
37	static unsigned long module_clk_recalc(struct clk *clk)	37	static unsigned long module_clk_recalc(struct clk *clk)
38	{	38	{
39	int frqcr = ctrl_inw(FRQCR);	39	int frqcr = __raw_readw(FRQCR);
40	int idx = ((frqcr & 0x2000) >> 11) \| (frqcr & 0x0003);	40	int idx = ((frqcr & 0x2000) >> 11) \| (frqcr & 0x0003);
41		41
42	return clk->parent->rate / pfc_divisors[idx];	42	return clk->parent->rate / pfc_divisors[idx];
@@ -48,7 +48,7 @@ static struct clk_ops sh7706_module_clk_ops = {
48		48
49	static unsigned long bus_clk_recalc(struct clk *clk)	49	static unsigned long bus_clk_recalc(struct clk *clk)
50	{	50	{
51	int frqcr = ctrl_inw(FRQCR);	51	int frqcr = __raw_readw(FRQCR);
52	int idx = ((frqcr & 0x8000) >> 13) \| ((frqcr & 0x0030) >> 4);	52	int idx = ((frqcr & 0x8000) >> 13) \| ((frqcr & 0x0030) >> 4);
53		53
54	return clk->parent->rate / stc_multipliers[idx];	54	return clk->parent->rate / stc_multipliers[idx];
@@ -60,7 +60,7 @@ static struct clk_ops sh7706_bus_clk_ops = {
60		60
61	static unsigned long cpu_clk_recalc(struct clk *clk)	61	static unsigned long cpu_clk_recalc(struct clk *clk)
62	{	62	{
63	int frqcr = ctrl_inw(FRQCR);	63	int frqcr = __raw_readw(FRQCR);
64	int idx = ((frqcr & 0x4000) >> 12) \| ((frqcr & 0x000c) >> 2);	64	int idx = ((frqcr & 0x4000) >> 12) \| ((frqcr & 0x000c) >> 2);
65		65
66	return clk->parent->rate / ifc_divisors[idx];	66	return clk->parent->rate / ifc_divisors[idx];