1 files changed, 190 insertions, 23 deletions

diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 9b3c41d18703..00d0741228fc 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -55,15 +55,19 @@ struct orion_watchdog_data {
         int wdt_counter_offset;
         int wdt_enable_bit;
         int rstout_enable_bit;
+        int rstout_mask_bit;
         int (*clock_init)(struct platform_device *,
                           struct orion_watchdog *);
+        int (*enabled)(struct orion_watchdog *);
         int (*start)(struct watchdog_device *);
+        int (*stop)(struct watchdog_device *);
 };
 
 struct orion_watchdog {
         struct watchdog_device wdt;
         void __iomem *reg;
         void __iomem *rstout;
+        void __iomem *rstout_mask;
         unsigned long clk_rate;
         struct clk *clk;
         const struct orion_watchdog_data *data;
@@ -142,9 +146,35 @@ static int orion_wdt_ping(struct watchdog_device *wdt_dev)
         return 0;
 }
 
+static int armada375_start(struct watchdog_device *wdt_dev)
+{
+        struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+        u32 reg;
+
+        /* Set watchdog duration */
+        writel(dev->clk_rate * wdt_dev->timeout,
+               dev->reg + dev->data->wdt_counter_offset);
+
+        /* Clear the watchdog expiration bit */
+        atomic_io_modify(dev->reg + TIMER_A370_STATUS, WDT_A370_EXPIRED, 0);
+
+        /* Enable watchdog timer */
+        atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit,
+                                                dev->data->wdt_enable_bit);
+
+        /* Enable reset on watchdog */
+        reg = readl(dev->rstout);
+        reg |= dev->data->rstout_enable_bit;
+        writel(reg, dev->rstout);
+
+        atomic_io_modify(dev->rstout_mask, dev->data->rstout_mask_bit, 0);
+        return 0;
+}
+
 static int armada370_start(struct watchdog_device *wdt_dev)
 {
         struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+        u32 reg;
 
         /* Set watchdog duration */
         writel(dev->clk_rate * wdt_dev->timeout,
@@ -157,8 +187,10 @@ static int armada370_start(struct watchdog_device *wdt_dev)
         atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit,
                                                 dev->data->wdt_enable_bit);
 
-        atomic_io_modify(dev->rstout, dev->data->rstout_enable_bit,
-                                      dev->data->rstout_enable_bit);
+        /* Enable reset on watchdog */
+        reg = readl(dev->rstout);
+        reg |= dev->data->rstout_enable_bit;
+        writel(reg, dev->rstout);
         return 0;
 }
 
@@ -189,7 +221,7 @@ static int orion_wdt_start(struct watchdog_device *wdt_dev)
         return dev->data->start(wdt_dev);
 }
 
-static int orion_wdt_stop(struct watchdog_device *wdt_dev)
+static int orion_stop(struct watchdog_device *wdt_dev)
 {
         struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
 
@@ -202,7 +234,48 @@ static int orion_wdt_stop(struct watchdog_device *wdt_dev)
         return 0;
 }
 
-static int orion_wdt_enabled(struct orion_watchdog *dev)
+static int armada375_stop(struct watchdog_device *wdt_dev)
+{
+        struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+        u32 reg;
+
+        /* Disable reset on watchdog */
+        atomic_io_modify(dev->rstout_mask, dev->data->rstout_mask_bit,
+                                           dev->data->rstout_mask_bit);
+        reg = readl(dev->rstout);
+        reg &= ~dev->data->rstout_enable_bit;
+        writel(reg, dev->rstout);
+
+        /* Disable watchdog timer */
+        atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0);
+
+        return 0;
+}
+
+static int armada370_stop(struct watchdog_device *wdt_dev)
+{
+        struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+        u32 reg;
+
+        /* Disable reset on watchdog */
+        reg = readl(dev->rstout);
+        reg &= ~dev->data->rstout_enable_bit;
+        writel(reg, dev->rstout);
+
+        /* Disable watchdog timer */
+        atomic_io_modify(dev->reg + TIMER_CTRL, dev->data->wdt_enable_bit, 0);
+
+        return 0;
+}
+
+static int orion_wdt_stop(struct watchdog_device *wdt_dev)
+{
+        struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+
+        return dev->data->stop(wdt_dev);
+}
+
+static int orion_enabled(struct orion_watchdog *dev)
 {
         bool enabled, running;
 
@@ -212,6 +285,24 @@ static int orion_wdt_enabled(struct orion_watchdog *dev)
         return enabled && running;
 }
 
+static int armada375_enabled(struct orion_watchdog *dev)
+{
+        bool masked, enabled, running;
+
+        masked = readl(dev->rstout_mask) & dev->data->rstout_mask_bit;
+        enabled = readl(dev->rstout) & dev->data->rstout_enable_bit;
+        running = readl(dev->reg + TIMER_CTRL) & dev->data->wdt_enable_bit;
+
+        return !masked && enabled && running;
+}
+
+static int orion_wdt_enabled(struct watchdog_device *wdt_dev)
+{
+        struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
+
+        return dev->data->enabled(dev);
+}
+
 static unsigned int orion_wdt_get_timeleft(struct watchdog_device *wdt_dev)
 {
         struct orion_watchdog *dev = watchdog_get_drvdata(wdt_dev);
@@ -262,10 +353,6 @@ static void __iomem *orion_wdt_ioremap_rstout(struct platform_device *pdev,
                 return devm_ioremap(&pdev->dev, res->start,
                                     resource_size(res));
 
-        /* This workaround works only for "orion-wdt", DT-enabled */
-        if (!of_device_is_compatible(pdev->dev.of_node, "marvell,orion-wdt"))
-                return NULL;
-
         rstout = internal_regs + ORION_RSTOUT_MASK_OFFSET;
 
         WARN(1, FW_BUG "falling back to harcoded RSTOUT reg %pa\n", &rstout);
@@ -277,7 +364,9 @@ static const struct orion_watchdog_data orion_data = {
         .wdt_enable_bit = BIT(4),
         .wdt_counter_offset = 0x24,
         .clock_init = orion_wdt_clock_init,
+        .enabled = orion_enabled,
         .start = orion_start,
+        .stop = orion_stop,
 };
 
 static const struct orion_watchdog_data armada370_data = {
@@ -285,7 +374,9 @@ static const struct orion_watchdog_data armada370_data = {
         .wdt_enable_bit = BIT(8),
         .wdt_counter_offset = 0x34,
         .clock_init = armada370_wdt_clock_init,
+        .enabled = orion_enabled,
         .start = armada370_start,
+        .stop = armada370_stop,
 };
 
 static const struct orion_watchdog_data armadaxp_data = {
@@ -293,7 +384,31 @@ static const struct orion_watchdog_data armadaxp_data = {
         .wdt_enable_bit = BIT(8),
         .wdt_counter_offset = 0x34,
         .clock_init = armadaxp_wdt_clock_init,
+        .enabled = orion_enabled,
         .start = armada370_start,
+        .stop = armada370_stop,
+};
+
+static const struct orion_watchdog_data armada375_data = {
+        .rstout_enable_bit = BIT(8),
+        .rstout_mask_bit = BIT(10),
+        .wdt_enable_bit = BIT(8),
+        .wdt_counter_offset = 0x34,
+        .clock_init = armada370_wdt_clock_init,
+        .enabled = armada375_enabled,
+        .start = armada375_start,
+        .stop = armada375_stop,
+};
+
+static const struct orion_watchdog_data armada380_data = {
+        .rstout_enable_bit = BIT(8),
+        .rstout_mask_bit = BIT(10),
+        .wdt_enable_bit = BIT(8),
+        .wdt_counter_offset = 0x34,
+        .clock_init = armadaxp_wdt_clock_init,
+        .enabled = armada375_enabled,
+        .start = armada375_start,
+        .stop = armada375_stop,
 };
 
 static const struct of_device_id orion_wdt_of_match_table[] = {
@@ -309,16 +424,78 @@ static const struct of_device_id orion_wdt_of_match_table[] = {
                 .compatible = "marvell,armada-xp-wdt",
                 .data = &armadaxp_data,
         },
+        {
+                .compatible = "marvell,armada-375-wdt",
+                .data = &armada375_data,
+        },
+        {
+                .compatible = "marvell,armada-380-wdt",
+                .data = &armada380_data,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table);
 
+static int orion_wdt_get_regs(struct platform_device *pdev,
+                              struct orion_watchdog *dev)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENODEV;
+        dev->reg = devm_ioremap(&pdev->dev, res->start,
+                                resource_size(res));
+        if (!dev->reg)
+                return -ENOMEM;
+
+        /* Each supported compatible has some RSTOUT register quirk */
+        if (of_device_is_compatible(node, "marvell,orion-wdt")) {
+
+                dev->rstout = orion_wdt_ioremap_rstout(pdev, res->start &
+                                                       INTERNAL_REGS_MASK);
+                if (!dev->rstout)
+                        return -ENODEV;
+
+        } else if (of_device_is_compatible(node, "marvell,armada-370-wdt") ||
+                   of_device_is_compatible(node, "marvell,armada-xp-wdt")) {
+
+                /* Dedicated RSTOUT register, can be requested. */
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                dev->rstout = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(dev->rstout))
+                        return PTR_ERR(dev->rstout);
+
+        } else if (of_device_is_compatible(node, "marvell,armada-375-wdt") ||
+                   of_device_is_compatible(node, "marvell,armada-380-wdt")) {
+
+                /* Dedicated RSTOUT register, can be requested. */
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+                dev->rstout = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(dev->rstout))
+                        return PTR_ERR(dev->rstout);
+
+                res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
+                if (!res)
+                        return -ENODEV;
+                dev->rstout_mask = devm_ioremap(&pdev->dev, res->start,
+                                                resource_size(res));
+                if (!dev->rstout_mask)
+                        return -ENOMEM;
+
+        } else {
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
 static int orion_wdt_probe(struct platform_device *pdev)
 {
         struct orion_watchdog *dev;
         const struct of_device_id *match;
         unsigned int wdt_max_duration;  /* (seconds) */
-        struct resource *res;
         int ret, irq;
 
         dev = devm_kzalloc(&pdev->dev, sizeof(struct orion_watchdog),
@@ -336,19 +513,9 @@ static int orion_wdt_probe(struct platform_device *pdev)
         dev->wdt.min_timeout = 1;
         dev->data = match->data;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res)
-                return -ENODEV;
-
-        dev->reg = devm_ioremap(&pdev->dev, res->start,
-                               resource_size(res));
-        if (!dev->reg)
-                return -ENOMEM;
-
-        dev->rstout = orion_wdt_ioremap_rstout(pdev, res->start &
-                                                     INTERNAL_REGS_MASK);
-        if (!dev->rstout)
-                return -ENODEV;
+        ret = orion_wdt_get_regs(pdev, dev);
+        if (ret)
+                return ret;
 
         ret = dev->data->clock_init(pdev, dev);
         if (ret) {
@@ -371,7 +538,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
          * removed and re-insterted, or if the bootloader explicitly
          * set a running watchdog before booting the kernel.
          */
-        if (!orion_wdt_enabled(dev))
+        if (!orion_wdt_enabled(&dev->wdt))
                 orion_wdt_stop(&dev->wdt);
 
         /* Request the IRQ only after the watchdog is disabled */