diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:27:21 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:29:20 +0100 |
commit | 5db45002576f7d60c5bf7b23e277845cd3e806be (patch) | |
tree | 18cf276c8c0d64c5011784b814db586c0d5476cb /drivers/clocksource | |
parent | 7135466151f0560604c2bfc4c27ff9cc2a40f8cd (diff) | |
parent | ba62a8593d15f3f353acdc8ab32c18dd40a275bb (diff) | |
download | linux-stable-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.gz linux-stable-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.bz2 linux-stable-5db45002576f7d60c5bf7b23e277845cd3e806be.zip |
Merge branch 'at91/cleanup5' into next/drivers
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/timer-atmel-pit.c | 32 |
1 files changed, 0 insertions, 32 deletions
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) } 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")); -} |