1 files changed, 181 insertions, 19 deletions

diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 8bdcc3cb6012..1083739e3065 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -9,6 +9,7 @@
 #include <linux/io.h>
 #include <linux/mm.h>
 #include <linux/pm.h>
+#include <linux/of_address.h>
 
 #include <asm/mach/map.h>
 
@@ -29,9 +30,12 @@ EXPORT_SYMBOL(at91_soc_initdata);
 void __init at91rm9200_set_type(int type)
 {
         if (type == ARCH_REVISON_9200_PQFP)
-                at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
-        else
                 at91_soc_initdata.subtype = AT91_SOC_RM9200_PQFP;
+        else
+                at91_soc_initdata.subtype = AT91_SOC_RM9200_BGA;
+
+        pr_info("AT91: filled in soc subtype: %s\n",
+                at91_get_soc_subtype(&at91_soc_initdata));
 }
 
 void __init at91_init_irq_default(void)
@@ -48,6 +52,19 @@ void __init at91_init_interrupts(unsigned int *priority)
         at91_gpio_irq_setup();
 }
 
+void __iomem *at91_ramc_base[2];
+
+void __init at91_ioremap_ramc(int id, u32 addr, u32 size)
+{
+        if (id < 0 || id > 1) {
+                pr_emerg("Wrong RAM controller id (%d), cannot continue\n", id);
+                BUG();
+        }
+        at91_ramc_base[id] = ioremap(addr, size);
+        if (!at91_ramc_base[id])
+                panic("Impossible to ioremap ramc.%d 0x%x\n", id, addr);
+}
+
 static struct map_desc sram_desc[2] __initdata;
 
 void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
@@ -83,20 +100,6 @@ static void __init soc_detect(u32 dbgu_base)
         socid = cidr & ~AT91_CIDR_VERSION;
 
         switch (socid) {
-        case ARCH_ID_AT91CAP9: {
-#ifdef CONFIG_AT91_PMC_UNIT
-                u32 pmc_ver = at91_sys_read(AT91_PMC_VER);
-
-                if (pmc_ver == ARCH_REVISION_CAP9_B)
-                        at91_soc_initdata.subtype = AT91_SOC_CAP9_REV_B;
-                else if (pmc_ver == ARCH_REVISION_CAP9_C)
-                        at91_soc_initdata.subtype = AT91_SOC_CAP9_REV_C;
-#endif
-                at91_soc_initdata.type = AT91_SOC_CAP9;
-                at91_boot_soc = at91cap9_soc;
-                break;
-        }
-
         case ARCH_ID_AT91RM9200:
                 at91_soc_initdata.type = AT91_SOC_RM9200;
                 at91_boot_soc = at91rm9200_soc;
@@ -197,7 +200,6 @@ static void __init soc_detect(u32 dbgu_base)
 
 static const char *soc_name[] = {
         [AT91_SOC_RM9200]       = "at91rm9200",
-        [AT91_SOC_CAP9]         = "at91cap9",
         [AT91_SOC_SAM9260]      = "at91sam9260",
         [AT91_SOC_SAM9261]      = "at91sam9261",
         [AT91_SOC_SAM9263]      = "at91sam9263",
@@ -218,8 +220,6 @@ EXPORT_SYMBOL(at91_get_soc_type);
 static const char *soc_subtype_name[] = {
         [AT91_SOC_RM9200_BGA]   = "at91rm9200 BGA",
         [AT91_SOC_RM9200_PQFP]  = "at91rm9200 PQFP",
-        [AT91_SOC_CAP9_REV_B]   = "at91cap9 revB",
-        [AT91_SOC_CAP9_REV_C]   = "at91cap9 revC",
         [AT91_SOC_SAM9XE]       = "at91sam9xe",
         [AT91_SOC_SAM9G45ES]    = "at91sam9g45es",
         [AT91_SOC_SAM9M10]      = "at91sam9m10",
@@ -281,6 +281,168 @@ void __init at91_ioremap_shdwc(u32 base_addr)
         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 __iomem *at91_matrix_base;
+
+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");
+}
+
+#if defined(CONFIG_OF)
+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 availlable\n");
+
+        arm_pm_restart = of_id->data;
+
+        of_node_put(np);
+}
+
+static struct of_device_id ramc_ids[] = {
+        { .compatible = "atmel,at91sam9260-sdramc" },
+        { .compatible = "atmel,at91sam9g45-ddramc" },
+        { /*sentinel*/ }
+};
+
+static void at91_dt_ramc(void)
+{
+        struct device_node *np;
+
+        np = of_find_matching_node(NULL, ramc_ids);
+        if (!np)
+                panic("unable to find compatible ram conroller 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_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",
+};
+
+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("AT91: unable to find compatible shutdown (shdwc) conroller node in dtb\n");
+                return;
+        }
+
+        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 (!of_property_read_u32(np, "atmel,wakeup-counter", &reg)) {
+                if (reg > AT91_SHDW_CPTWK0_MAX) {
+                        pr_warn("AT91: shdwc wakeup conter 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 at91_dt_initialize(void)
+{
+        at91_dt_rstc();
+        at91_dt_ramc();
+        at91_dt_shdwc();
+
+        /* Init clock subsystem */
+        at91_dt_clock_init();
+
+        /* Register the processor-specific clocks */
+        at91_boot_soc.register_clocks();
+
+        at91_boot_soc.init();
+}
+#endif
+
 void __init at91_initialize(unsigned long main_clock)
 {
         at91_boot_soc.ioremap_registers();