]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ARM: at91: Remove the old-style reset probing
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Wed, 2 Jul 2014 15:47:50 +0000 (17:47 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 14:03:00 +0000 (16:03 +0200)
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>
arch/arm/mach-at91/setup.c

index 0c8daf7a4a772f3b4f4e104eea396607c58e30c2..640c21e43a425e5b33e5f0e17c6ad7928a3ff148 100644 (file)
@@ -355,34 +355,6 @@ void __init at91_ioremap_matrix(u32 base_addr)
 }
 
 #if defined(CONFIG_OF) && !defined(CONFIG_ARCH_AT91X40)
-static struct of_device_id rstc_ids[] = {
-       { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9_alt_restart },
-       { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
-       { /*sentinel*/ }
-};
-
-static void at91_dt_rstc(void)
-{
-       struct device_node *np;
-       const struct of_device_id *of_id;
-
-       np = of_find_matching_node(NULL, rstc_ids);
-       if (!np)
-               panic(pr_fmt("unable to find compatible rstc node in dtb\n"));
-
-       at91_rstc_base = of_iomap(np, 0);
-       if (!at91_rstc_base)
-               panic(pr_fmt("unable to map rstc cpu registers\n"));
-
-       of_id = of_match_node(rstc_ids, np);
-       if (!of_id)
-               panic(pr_fmt("rtsc no restart function available\n"));
-
-       arm_pm_restart = of_id->data;
-
-       of_node_put(np);
-}
-
 static struct of_device_id ramc_ids[] = {
        { .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },
        { .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },
@@ -509,7 +481,6 @@ void __init at91rm9200_dt_initialize(void)
 
 void __init at91_dt_initialize(void)
 {
-       at91_dt_rstc();
        at91_dt_ramc();
        at91_dt_shdwc();