diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-07-02 11:47:50 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-25 10:03:00 -0400 |
commit | 4b0a683cf16eac06385c96c2fcf21766818f757c (patch) | |
tree | 41ee55d2ff3db5090d84b6e53c2933c3e85360bb | |
parent | 8d248f0d3a1ddb3c671b4029f8950fbad09be7ae (diff) |
ARM: at91: Remove the old-style reset probing
Now that the reset code is a driver of its own, just let the usual DT probing
mecanism do its job, and remove the code entirely in this case.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/setup.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 0c8daf7a4a77..640c21e43a42 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
@@ -355,34 +355,6 @@ void __init at91_ioremap_matrix(u32 base_addr) | |||
355 | } | 355 | } |
356 | 356 | ||
357 | #if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40) | 357 | #if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40) |
358 | static struct of_device_id rstc_ids[] = { | ||
359 | { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9_alt_restart }, | ||
360 | { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart }, | ||
361 | { /*sentinel*/ } | ||
362 | }; | ||
363 | |||
364 | static void at91_dt_rstc(void) | ||
365 | { | ||
366 | struct device_node *np; | ||
367 | const struct of_device_id *of_id; | ||
368 | |||
369 | np = of_find_matching_node(NULL, rstc_ids); | ||
370 | if (!np) | ||
371 | panic(pr_fmt("unable to find compatible rstc node in dtb\n")); | ||
372 | |||
373 | at91_rstc_base = of_iomap(np, 0); | ||
374 | if (!at91_rstc_base) | ||
375 | panic(pr_fmt("unable to map rstc cpu registers\n")); | ||
376 | |||
377 | of_id = of_match_node(rstc_ids, np); | ||
378 | if (!of_id) | ||
379 | panic(pr_fmt("rtsc no restart function available\n")); | ||
380 | |||
381 | arm_pm_restart = of_id->data; | ||
382 | |||
383 | of_node_put(np); | ||
384 | } | ||
385 | |||
386 | static struct of_device_id ramc_ids[] = { | 358 | static struct of_device_id ramc_ids[] = { |
387 | { .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby }, | 359 | { .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby }, |
388 | { .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby }, | 360 | { .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby }, |
@@ -509,7 +481,6 @@ void __init at91rm9200_dt_initialize(void) | |||
509 | 481 | ||
510 | void __init at91_dt_initialize(void) | 482 | void __init at91_dt_initialize(void) |
511 | { | 483 | { |
512 | at91_dt_rstc(); | ||
513 | at91_dt_ramc(); | 484 | at91_dt_ramc(); |
514 | at91_dt_shdwc(); | 485 | at91_dt_shdwc(); |
515 | 486 | ||