Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-block.git] / arch / arm / mach-at91 / setup.c
index ebe7fdca9e83fb6b5eb6f1d72eaa1b801139a3fa..961079250b837c25ca7623563285fc090dd09e00 100644 (file)
@@ -5,6 +5,8 @@
  * Under GPLv2
  */
 
+#define pr_fmt(fmt)    "AT91: " fmt
+
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/mm.h>
@@ -20,7 +22,6 @@
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 
-#include "at91_shdwc.h"
 #include "soc.h"
 #include "generic.h"
 #include "pm.h"
@@ -37,7 +38,7 @@ void __init at91rm9200_set_type(int type)
        else
                at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
 
-       pr_info("AT91: filled in soc subtype: %s\n",
+       pr_info("filled in soc subtype: %s\n",
                at91_get_soc_subtype(&at91_soc_initdata));
 }
 
@@ -67,7 +68,7 @@ void __init at91_ioremap_ramc(int id, u32 addr, u32 size)
        }
        at91_ramc_base[id] = ioremap(addr, size);
        if (!at91_ramc_base[id])
-               panic("Impossible to ioremap ramc.%d 0x%x\n", id, addr);
+               panic(pr_fmt("Impossible to ioremap ramc.%d 0x%x\n"), id, addr);
 }
 
 static struct map_desc sram_desc[2] __initdata;
@@ -84,7 +85,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
        desc->length = length;
        desc->type = MT_MEMORY_RWX_NONCACHED;
 
-       pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
+       pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
                base, length, desc->virtual);
 
        iotable_init(desc, 1);
@@ -367,45 +368,21 @@ void __init at91_map_io(void)
                soc_detect(AT91_BASE_DBGU1);
 
        if (!at91_soc_is_detected())
-               panic("AT91: Impossible to detect the SOC type");
+               panic(pr_fmt("Impossible to detect the SOC type"));
 
-       pr_info("AT91: Detected soc type: %s\n",
+       pr_info("Detected soc type: %s\n",
                at91_get_soc_type(&at91_soc_initdata));
        if (at91_soc_initdata.subtype != AT91_SOC_SUBTYPE_NONE)
-               pr_info("AT91: Detected soc subtype: %s\n",
+               pr_info("Detected soc subtype: %s\n",
                        at91_get_soc_subtype(&at91_soc_initdata));
 
        if (!at91_soc_is_enabled())
-               panic("AT91: Soc not enabled");
+               panic(pr_fmt("Soc not enabled"));
 
        if (at91_boot_soc.map_io)
                at91_boot_soc.map_io();
 }
 
-void __iomem *at91_shdwc_base = NULL;
-
-static void at91sam9_poweroff(void)
-{
-       at91_shdwc_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-void __init at91_ioremap_shdwc(u32 base_addr)
-{
-       at91_shdwc_base = ioremap(base_addr, 16);
-       if (!at91_shdwc_base)
-               panic("Impossible to ioremap at91_shdwc_base\n");
-       pm_power_off = at91sam9_poweroff;
-}
-
-void __iomem *at91_rstc_base;
-
-void __init at91_ioremap_rstc(u32 base_addr)
-{
-       at91_rstc_base = ioremap(base_addr, 16);
-       if (!at91_rstc_base)
-               panic("Impossible to ioremap at91_rstc_base\n");
-}
-
 void __init at91_alt_map_io(void)
 {
        /* Map peripherals */
@@ -438,42 +415,15 @@ void __init at91_ioremap_matrix(u32 base_addr)
 {
        at91_matrix_base = ioremap(base_addr, 512);
        if (!at91_matrix_base)
-               panic("Impossible to ioremap at91_matrix_base\n");
+               panic(pr_fmt("Impossible to ioremap at91_matrix_base\n"));
 }
 
 #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("unable to find compatible rstc node in dtb\n");
-
-       at91_rstc_base = of_iomap(np, 0);
-       if (!at91_rstc_base)
-               panic("unable to map rstc cpu registers\n");
-
-       of_id = of_match_node(rstc_ids, np);
-       if (!of_id)
-               panic("AT91: 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 },
        { .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },
+       { .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },
        { /*sentinel*/ }
 };
 
@@ -481,100 +431,29 @@ static void at91_dt_ramc(void)
 {
        struct device_node *np;
        const struct of_device_id *of_id;
+       int idx = 0;
+       const void *standby = NULL;
 
-       np = of_find_matching_node(NULL, ramc_ids);
-       if (!np)
-               panic("unable to find compatible ram controller node in dtb\n");
-
-       at91_ramc_base[0] = of_iomap(np, 0);
-       if (!at91_ramc_base[0])
-               panic("unable to map ramc[0] cpu registers\n");
-       /* the controller may have 2 banks */
-       at91_ramc_base[1] = of_iomap(np, 1);
-
-       of_id = of_match_node(ramc_ids, np);
-       if (!of_id)
-               pr_warn("AT91: ramc no standby function available\n");
-       else
-               at91_pm_set_standby(of_id->data);
-
-       of_node_put(np);
-}
-
-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",
-};
+       for_each_matching_node_and_match(np, ramc_ids, &of_id) {
+               at91_ramc_base[idx] = of_iomap(np, 0);
+               if (!at91_ramc_base[idx])
+                       panic(pr_fmt("unable to map ramc[%d] cpu registers\n"), idx);
 
-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;
+               if (!standby)
+                       standby = of_id->data;
 
-       np = of_find_matching_node(NULL, shdwc_ids);
-       if (!np) {
-               pr_debug("AT91: unable to find compatible shutdown (shdwc) controller node in dtb\n");
-               return;
+               idx++;
        }
 
-       at91_shdwc_base = of_iomap(np, 0);
-       if (!at91_shdwc_base)
-               panic("AT91: unable to map shdwc cpu registers\n");
-
-       wakeup_mode = at91_dtget_shdwc_wakeup_mode(np);
-       if (wakeup_mode < 0) {
-               pr_warn("AT91: shdwc unknown wakeup mode\n");
-               goto end;
-       }
+       if (!idx)
+               panic(pr_fmt("unable to find compatible ram controller node in dtb\n"));
 
-       if (!of_property_read_u32(np, "atmel,wakeup-counter", &reg)) {
-               if (reg > AT91_SHDW_CPTWK0_MAX) {
-                       pr_warn("AT91: 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 (!standby) {
+               pr_warn("ramc no standby function available\n");
+               return;
        }
 
-       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);
+       at91_pm_set_standby(standby);
 }
 
 void __init at91rm9200_dt_initialize(void)
@@ -593,9 +472,7 @@ void __init at91rm9200_dt_initialize(void)
 
 void __init at91_dt_initialize(void)
 {
-       at91_dt_rstc();
        at91_dt_ramc();
-       at91_dt_shdwc();
 
        /* Init clock subsystem */
        at91_dt_clock_init();
@@ -623,3 +500,13 @@ void __init at91_initialize(unsigned long main_clock)
 
        pinctrl_provide_dummies();
 }
+
+void __init at91_register_devices(void)
+{
+       at91_boot_soc.register_devices();
+}
+
+void __init at91_init_time(void)
+{
+       at91_boot_soc.init_time();
+}