]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: at91: Remove poweroff DT probing
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Mon, 7 Jul 2014 14:25:26 +0000 (16:25 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 25 Aug 2014 14:24:25 +0000 (16:24 +0200)
Now that the poweroff code is a driver of its own, remove the DT probing in
mach-at91 and let the usual DT code do its job.

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 25196d5096beb09ef72b6ad40b609c355f221f64..6fe03f31d3d2a723cbaedcf844cb3ce3a61af8db 100644 (file)
@@ -389,82 +389,6 @@ static void at91_dt_ramc(void)
        at91_pm_set_standby(of_id->data);
 }
 
-static struct of_device_id shdwc_ids[] = {
-       { .compatible = "atmel,at91sam9260-shdwc", },
-       { .compatible = "atmel,at91sam9rl-shdwc", },
-       { .compatible = "atmel,at91sam9x5-shdwc", },
-       { /*sentinel*/ }
-};
-
-static const char *shdwc_wakeup_modes[] = {
-       [AT91_SHDW_WKMODE0_NONE]        = "none",
-       [AT91_SHDW_WKMODE0_HIGH]        = "high",
-       [AT91_SHDW_WKMODE0_LOW]         = "low",
-       [AT91_SHDW_WKMODE0_ANYLEVEL]    = "any",
-};
-
-const int at91_dtget_shdwc_wakeup_mode(struct device_node *np)
-{
-       const char *pm;
-       int err, i;
-
-       err = of_property_read_string(np, "atmel,wakeup-mode", &pm);
-       if (err < 0)
-               return AT91_SHDW_WKMODE0_ANYLEVEL;
-
-       for (i = 0; i < ARRAY_SIZE(shdwc_wakeup_modes); i++)
-               if (!strcasecmp(pm, shdwc_wakeup_modes[i]))
-                       return i;
-
-       return -ENODEV;
-}
-
-static void at91_dt_shdwc(void)
-{
-       struct device_node *np;
-       int wakeup_mode;
-       u32 reg;
-       u32 mode = 0;
-
-       np = of_find_matching_node(NULL, shdwc_ids);
-       if (!np) {
-               pr_debug("unable to find compatible shutdown (shdwc) controller node in dtb\n");
-               return;
-       }
-
-       at91_shdwc_base = of_iomap(np, 0);
-       if (!at91_shdwc_base)
-               panic(pr_fmt("unable to map shdwc cpu registers\n"));
-
-       wakeup_mode = at91_dtget_shdwc_wakeup_mode(np);
-       if (wakeup_mode < 0) {
-               pr_warn("shdwc unknown wakeup mode\n");
-               goto end;
-       }
-
-       if (!of_property_read_u32(np, "atmel,wakeup-counter", &reg)) {
-               if (reg > AT91_SHDW_CPTWK0_MAX) {
-                       pr_warn("shdwc wakeup counter 0x%x > 0x%x reduce it to 0x%x\n",
-                               reg, AT91_SHDW_CPTWK0_MAX, AT91_SHDW_CPTWK0_MAX);
-                       reg = AT91_SHDW_CPTWK0_MAX;
-               }
-               mode |= AT91_SHDW_CPTWK0_(reg);
-       }
-
-       if (of_property_read_bool(np, "atmel,wakeup-rtc-timer"))
-                       mode |= AT91_SHDW_RTCWKEN;
-
-       if (of_property_read_bool(np, "atmel,wakeup-rtt-timer"))
-                       mode |= AT91_SHDW_RTTWKEN;
-
-       at91_shdwc_write(AT91_SHDW_MR, wakeup_mode | mode);
-
-end:
-       pm_power_off = at91sam9_poweroff;
-
-       of_node_put(np);
-}
-
 void __init at91rm9200_dt_initialize(void)
 {
        at91_dt_ramc();
@@ -482,7 +406,6 @@ void __init at91rm9200_dt_initialize(void)
 void __init at91_dt_initialize(void)
 {
        at91_dt_ramc();
-       at91_dt_shdwc();
 
        /* Init clock subsystem */
        at91_dt_clock_init();