Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[cascardo/linux.git] / drivers / power / reset / at91-reset.c

diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 36dc52f..c378d4e 100644 (file)
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -123,6 +123,15 @@ static int at91sam9g45_restart(struct notifier_block *this, unsigned long mode,
        return NOTIFY_DONE;
 }
 
+static int sama5d3_restart(struct notifier_block *this, unsigned long mode,
+                          void *cmd)
+{
+       writel(cpu_to_le32(AT91_RSTC_KEY | AT91_RSTC_PERRST | AT91_RSTC_PROCRST),
+              at91_rstc_base);
+
+       return NOTIFY_DONE;
+}
+
 static void __init at91_reset_status(struct platform_device *pdev)
 {
        u32 reg = readl(at91_rstc_base + AT91_RSTC_SR);
@@ -155,13 +164,13 @@ static void __init at91_reset_status(struct platform_device *pdev)
 static const struct of_device_id at91_ramc_of_match[] = {
        { .compatible = "atmel,at91sam9260-sdramc", },
        { .compatible = "atmel,at91sam9g45-ddramc", },
-       { .compatible = "atmel,sama5d3-ddramc", },
        { /* sentinel */ }
 };
 
 static const struct of_device_id at91_reset_of_match[] = {
        { .compatible = "atmel,at91sam9260-rstc", .data = at91sam9260_restart },
        { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
+       { .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart },
        { /* sentinel */ }
 };
 
@@ -181,13 +190,16 @@ static int at91_reset_of_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       for_each_matching_node(np, at91_ramc_of_match) {
-               at91_ramc_base[idx] = of_iomap(np, 0);
-               if (!at91_ramc_base[idx]) {
-                       dev_err(&pdev->dev, "Could not map ram controller address\n");
-                       return -ENODEV;
+       if (!of_device_is_compatible(pdev->dev.of_node, "atmel,sama5d3-rstc")) {
+               /* we need to shutdown the ddr controller, so get ramc base */
+               for_each_matching_node(np, at91_ramc_of_match) {
+                       at91_ramc_base[idx] = of_iomap(np, 0);
+                       if (!at91_ramc_base[idx]) {
+                               dev_err(&pdev->dev, "Could not map ram controller address\n");
+                               return -ENODEV;
+                       }
+                       idx++;
                }
-               idx++;
        }
 
        match = of_match_node(at91_reset_of_match, pdev->dev.of_node);