diff options
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 5c38c94b79a2..3991077f58a2 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | ****************************************************************************/ | 42 | ****************************************************************************/ |
| 43 | static struct map_desc kirkwood_io_desc[] __initdata = { | 43 | static struct map_desc kirkwood_io_desc[] __initdata = { |
| 44 | { | 44 | { |
| 45 | .virtual = KIRKWOOD_REGS_VIRT_BASE, | 45 | .virtual = (unsigned long) KIRKWOOD_REGS_VIRT_BASE, |
| 46 | .pfn = __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE), | 46 | .pfn = __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE), |
| 47 | .length = KIRKWOOD_REGS_SIZE, | 47 | .length = KIRKWOOD_REGS_SIZE, |
| 48 | .type = MT_DEVICE, | 48 | .type = MT_DEVICE, |
| @@ -205,8 +205,7 @@ static struct clk *tclk; | |||
| 205 | 205 | ||
| 206 | static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx) | 206 | static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx) |
| 207 | { | 207 | { |
| 208 | return clk_register_gate(NULL, name, "tclk", 0, | 208 | return clk_register_gate(NULL, name, "tclk", 0, CLOCK_GATING_CTRL, |
| 209 | (void __iomem *)CLOCK_GATING_CTRL, | ||
| 210 | bit_idx, 0, &gating_lock); | 209 | bit_idx, 0, &gating_lock); |
| 211 | } | 210 | } |
| 212 | 211 | ||
| @@ -215,8 +214,7 @@ static struct clk __init *kirkwood_register_gate_fn(const char *name, | |||
| 215 | void (*fn_en)(void), | 214 | void (*fn_en)(void), |
| 216 | void (*fn_dis)(void)) | 215 | void (*fn_dis)(void)) |
| 217 | { | 216 | { |
| 218 | return clk_register_gate_fn(NULL, name, "tclk", 0, | 217 | return clk_register_gate_fn(NULL, name, "tclk", 0, CLOCK_GATING_CTRL, |
| 219 | (void __iomem *)CLOCK_GATING_CTRL, | ||
| 220 | bit_idx, 0, &gating_lock, fn_en, fn_dis); | 218 | bit_idx, 0, &gating_lock, fn_en, fn_dis); |
| 221 | } | 219 | } |
| 222 | 220 | ||
