diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 13:11:03 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 13:11:03 -0500 |
commit | ef1dfa7332e9205b532da1c2d286757ce511cd1d (patch) | |
tree | 0b079f2308c90878eaf14e8889fd3e7241aa29b8 /drivers/clocksource/timer-atmel-pit.c | |
parent | 3d2660694cd1b3d3a2442d46859e7ea740a551d4 (diff) | |
parent | ba62a8593d15f3f353acdc8ab32c18dd40a275bb (diff) |
Merge tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Fifth batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- removal of now dead code and AT91-specific driver
- removal of !DT initialization in some core AT91 drivers
- simplification of Kconfig DT board file selection: now automatic
* tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: remove unused board.h file
ARM: at91: remove unneeded header files
ARM: at91/clocksource: remove !DT PIT initializations
ARM: at91: at91rm9200 ST initialization is now DT only
ARM: at91: remove old AT91-specific drivers
ARM: at91: cleanup initilisation code by removing dead code
ARM: at91/Kconfig: select board files automatically
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource/timer-atmel-pit.c')
-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) | |||
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 | } | ||