ARM: at91/clocksource: remove !DT PIT initializations
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Dec 2014 13:54:03 +0000 (14:54 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 3 Dec 2014 13:15:52 +0000 (14:15 +0100)
As AT91 !DT code is now removed, cleanup the PIT clocksource driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[nicolas.ferre@atmel.com: split patch]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
arch/arm/mach-at91/generic.h
drivers/clocksource/timer-atmel-pit.c

index 8527e8bd675f790eb1f74b4a88ac758855896015..d53324210adf62310d15a191380eed7b3e2e6e9e 100644 (file)
@@ -31,8 +31,6 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
 
  /* Timer */
 extern void at91rm9200_timer_init(void);
-extern void at91sam926x_ioremap_pit(u32 addr);
-extern void at91sam926x_pit_init(int irq);
 
 /* idle */
 extern void at91sam9_idle(void);
index d5289098b3df41547e63630f1fc24b17e725cb0b..b5b4d4585c9aba41bc396e91cc107b710b154664 100644 (file)
@@ -262,35 +262,3 @@ static void __init at91sam926x_pit_dt_init(struct device_node *node)
 }
 CLOCKSOURCE_OF_DECLARE(at91sam926x_pit, "atmel,at91sam9260-pit",
                       at91sam926x_pit_dt_init);
-
-static void __iomem *pit_base_addr;
-
-void __init at91sam926x_pit_init(int irq)
-{
-       struct pit_data *data;
-
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
-       if (!data)
-               panic(pr_fmt("Unable to allocate memory\n"));
-
-       data->base = pit_base_addr;
-
-       data->mck = clk_get(NULL, "mck");
-       if (IS_ERR(data->mck))
-               panic(pr_fmt("Unable to get mck clk\n"));
-
-       data->irq = irq;
-
-       at91sam926x_pit_common_init(data);
-}
-
-void __init at91sam926x_ioremap_pit(u32 addr)
-{
-       if (of_have_populated_dt())
-               return;
-
-       pit_base_addr = ioremap(addr, 16);
-
-       if (!pit_base_addr)
-               panic(pr_fmt("Impossible to ioremap PIT\n"));
-}