diff options
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r-- | arch/arm/mach-realview/clock.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-realview/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 1 |
6 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-realview/clock.c b/arch/arm/mach-realview/clock.c index 2ba0667d18f5..18c545921e41 100644 --- a/arch/arm/mach-realview/clock.c +++ b/arch/arm/mach-realview/clock.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
20 | 20 | ||
21 | #include <asm/hardware/icst307.h> | 21 | #include <asm/hardware/icst.h> |
22 | 22 | ||
23 | #include "clock.h" | 23 | #include "clock.h" |
24 | 24 | ||
@@ -42,8 +42,8 @@ EXPORT_SYMBOL(clk_get_rate); | |||
42 | long clk_round_rate(struct clk *clk, unsigned long rate) | 42 | long clk_round_rate(struct clk *clk, unsigned long rate) |
43 | { | 43 | { |
44 | struct icst_vco vco; | 44 | struct icst_vco vco; |
45 | vco = icst307_hz_to_vco(clk->params, rate); | 45 | vco = icst_hz_to_vco(clk->params, rate); |
46 | return icst307_hz(clk->params, vco); | 46 | return icst_hz(clk->params, vco); |
47 | } | 47 | } |
48 | EXPORT_SYMBOL(clk_round_rate); | 48 | EXPORT_SYMBOL(clk_round_rate); |
49 | 49 | ||
@@ -54,8 +54,8 @@ int clk_set_rate(struct clk *clk, unsigned long rate) | |||
54 | if (clk->setvco) { | 54 | if (clk->setvco) { |
55 | struct icst_vco vco; | 55 | struct icst_vco vco; |
56 | 56 | ||
57 | vco = icst307_hz_to_vco(clk->params, rate); | 57 | vco = icst_hz_to_vco(clk->params, rate); |
58 | clk->rate = icst307_hz(clk->params, vco); | 58 | clk->rate = icst_hz(clk->params, vco); |
59 | clk->setvco(clk, vco); | 59 | clk->setvco(clk, vco); |
60 | ret = 0; | 60 | ret = 0; |
61 | } | 61 | } |
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 26d44caad540..a8c215a406a2 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/leds.h> | 39 | #include <asm/leds.h> |
40 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
41 | #include <asm/hardware/arm_timer.h> | 41 | #include <asm/hardware/arm_timer.h> |
42 | #include <asm/hardware/icst307.h> | 42 | #include <asm/hardware/icst.h> |
43 | 43 | ||
44 | #include <asm/mach/arch.h> | 44 | #include <asm/mach/arch.h> |
45 | #include <asm/mach/flash.h> | 45 | #include <asm/mach/flash.h> |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 7d857d300558..39d953c89d9a 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | #include <asm/hardware/gic.h> | 34 | #include <asm/hardware/gic.h> |
35 | #include <asm/hardware/icst307.h> | ||
36 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
37 | #include <asm/localtimer.h> | 36 | #include <asm/localtimer.h> |
38 | 37 | ||
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index 44392e51dd50..a93aac5f473e 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | #include <asm/hardware/gic.h> | 34 | #include <asm/hardware/gic.h> |
35 | #include <asm/hardware/icst307.h> | ||
36 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
37 | 36 | ||
38 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 3e02731af959..c7c656e235cc 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <asm/leds.h> | 32 | #include <asm/leds.h> |
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | #include <asm/hardware/gic.h> | 34 | #include <asm/hardware/gic.h> |
35 | #include <asm/hardware/icst307.h> | ||
36 | #include <asm/hardware/cache-l2x0.h> | 35 | #include <asm/hardware/cache-l2x0.h> |
37 | #include <asm/localtimer.h> | 36 | #include <asm/localtimer.h> |
38 | 37 | ||
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index fe4e25c4201a..3e3aaa3a2bc0 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <asm/leds.h> | 31 | #include <asm/leds.h> |
32 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
33 | #include <asm/hardware/gic.h> | 33 | #include <asm/hardware/gic.h> |
34 | #include <asm/hardware/icst307.h> | ||
35 | 34 | ||
36 | #include <asm/mach/arch.h> | 35 | #include <asm/mach/arch.h> |
37 | #include <asm/mach/map.h> | 36 | #include <asm/mach/map.h> |