I accidently put the devicetree bindings for the MEN A21 watchdog driver in Documentation/devicetree/bindings/gpio instead of Documentation/devicetree/bindings/watchdog, this patch addresses this error.
Signed-off-by: Johannes Thumshirn <johannes.thumsh...@men.de> Cc: Rob Herring <rob.herr...@calxeda.com> Cc: Pawel Moll <pawel.m...@arm.com> Cc: Mark Rutland <mark.rutl...@arm.com> Cc: Stephen Warren <swar...@wwwdotorg.org> Cc: Ian Campbell <ian.campb...@citrix.com> Cc: Rob Landley <r...@landley.net> Cc: Wim Van Sebroeck <w...@iguana.be> Cc: Guenter Roeck <li...@roeck-us.net> --- Changes to v1: - Use named gpios, as suggested by Stephen Warren .../bindings/{gpio => watchdog}/men-a021-wdt.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename Documentation/devicetree/bindings/{gpio => watchdog}/men-a021-wdt.txt (61%) diff --git a/Documentation/devicetree/bindings/gpio/men-a021-wdt.txt b/Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt similarity index 61% rename from Documentation/devicetree/bindings/gpio/men-a021-wdt.txt rename to Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt index 370dee3..0008f28 100644 --- a/Documentation/devicetree/bindings/gpio/men-a021-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt @@ -16,10 +16,10 @@ Optional properties: Example: watchdog { compatible ="men,a021-wdt"; - gpios = <&gpio3 9 1 /* WD_EN */ - &gpio3 10 1 /* WD_FAST */ - &gpio3 11 1 /* WD_TRIG */ - &gpio3 6 1 /* RST_CAUSE[0] */ - &gpio3 7 1 /* RST_CAUSE[1] */ - &gpio3 8 1>; /* RST_CAUSE[2] */ + enable-gpio = <&gpio3 9 1>; /* WD_EN */ + fast-gpio = <&gpio3 10 1>; /* WD_FAST */ + trig-gpio = <&gpio3 11 1>; /* WD_TRIG */ + rst-gpios = <&gpio3 6 1 /* RST_CAUSE[0] */ + &gpio3 7 1 /* RST_CAUSE[1] */ + &gpio3 8 1>; /* RST_CAUSE[2] */ }; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/