iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback

[linux-2.6-microblaze.git] / drivers / watchdog / sama5d4_wdt.c

diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index e5d11d6..ec20ad4 100644 (file)
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -268,8 +268,10 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
        wdd->min_timeout = MIN_WDT_TIMEOUT;
        wdd->max_timeout = MAX_WDT_TIMEOUT;
        wdt->last_ping = jiffies;
-       wdt->sam9x60_support = of_device_is_compatible(dev->of_node,
-                                                      "microchip,sam9x60-wdt");
+
+       if (of_device_is_compatible(dev->of_node, "microchip,sam9x60-wdt") ||
+           of_device_is_compatible(dev->of_node, "microchip,sama7g5-wdt"))
+               wdt->sam9x60_support = true;
 
        watchdog_set_drvdata(wdd, wdt);
 
@@ -329,6 +331,10 @@ static const struct of_device_id sama5d4_wdt_of_match[] = {
        {
                .compatible = "microchip,sam9x60-wdt",
        },
+       {
+               .compatible = "microchip,sama7g5-wdt",
+       },
+
        { }
 };
 MODULE_DEVICE_TABLE(of, sama5d4_wdt_of_match);