From 111579574584c73a91c2b1bf8657c3691cc22409 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Sun, 2 Feb 2014 14:55:23 +0100 Subject: [PATCH] wdt: sunxi: Introduce a new compatible for the A10 and A31 For historical reasons, the Allwinner A10 compatibles are not following the patterns used for this other Allwinner SoCs. Introduce a new compatible following the usual pattern, and deprecate the olders. Signed-off-by: Maxime Ripard --- Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 7 ++++--- drivers/watchdog/sunxi_wdt.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt index e39cb26..6e8c937 100644 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt @@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer Required properties: -- compatible : should be "allwinner,-wdt", the currently supported - SoC families being sun4i and sun6i +- compatible : should be either "allwinner,sun4i-a10-wdt" or + "allwinner,sun6i-a31-wdt" (deprecated: + "allwinner,sun4i-wdt", "allwinner,sun6i-wdt") - reg : Specifies base physical address and size of the registers. Example: wdt: watchdog@01c20c90 { - compatible = "allwinner,sun4i-wdt"; + compatible = "allwinner,sun4i-a10-wdt"; reg = <0x01c20c90 0x10>; }; diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index 76332d89..7c8923d 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev) static const struct of_device_id sunxi_wdt_dt_ids[] = { { .compatible = "allwinner,sun4i-wdt" }, + { .compatible = "allwinner,sun4i-a10-wdt" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids); -- 1.8.5.5