diff options
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 2 | ||||
| -rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 8527e8bd675f..d53324210adf 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h | |||
| @@ -31,8 +31,6 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base); | |||
| 31 | 31 | ||
| 32 | /* Timer */ | 32 | /* Timer */ |
| 33 | extern void at91rm9200_timer_init(void); | 33 | extern void at91rm9200_timer_init(void); |
| 34 | extern void at91sam926x_ioremap_pit(u32 addr); | ||
| 35 | extern void at91sam926x_pit_init(int irq); | ||
| 36 | 34 | ||
| 37 | /* idle */ | 35 | /* idle */ |
| 38 | extern void at91sam9_idle(void); | 36 | extern void at91sam9_idle(void); |
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c index d5289098b3df..b5b4d4585c9a 100644 --- a/drivers/clocksource/timer-atmel-pit.c +++ b/drivers/clocksource/timer-atmel-pit.c | |||
| @@ -262,35 +262,3 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node) | |||
| 262 | } | 262 | } |
| 263 | CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", | 263 | CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit", |
| 264 | at91sam926x_pit_dt_init); | 264 | at91sam926x_pit_dt_init); |
| 265 | |||
| 266 | static void __iomem *pit_base_addr; | ||
| 267 | |||
| 268 | void __init at91sam926x_pit_init(int irq) | ||
| 269 | { | ||
| 270 | struct pit_data *data; | ||
| 271 | |||
| 272 | data = kzalloc(sizeof(*data), GFP_KERNEL); | ||
| 273 | if (!data) | ||
| 274 | panic(pr_fmt("Unable to allocate memory\n")); | ||
| 275 | |||
| 276 | data->base = pit_base_addr; | ||
| 277 | |||
| 278 | data->mck = clk_get(NULL, "mck"); | ||
| 279 | if (IS_ERR(data->mck)) | ||
| 280 | panic(pr_fmt("Unable to get mck clk\n")); | ||
| 281 | |||
| 282 | data->irq = irq; | ||
| 283 | |||
| 284 | at91sam926x_pit_common_init(data); | ||
| 285 | } | ||
| 286 | |||
| 287 | void __init at91sam926x_ioremap_pit(u32 addr) | ||
| 288 | { | ||
| 289 | if (of_have_populated_dt()) | ||
| 290 | return; | ||
| 291 | |||
| 292 | pit_base_addr = ioremap(addr, 16); | ||
| 293 | |||
| 294 | if (!pit_base_addr) | ||
| 295 | panic(pr_fmt("Impossible to ioremap PIT\n")); | ||
| 296 | } | ||
