| Message ID | 1486172055-13162-1-git-send-email-baoyou.xie@linaro.org |
|---|---|
| State | Accepted |
| Commit | df823c19e5245148b0557577000fb73274af3656 |
| Headers | show |
| Series | [v9,1/3] dt: bindings: add documentation for zx2967 family watchdog controller | expand |
On 02/03/2017 05:34 PM, Baoyou Xie wrote: > This patch adds dt-binding documentation for zx2967 family > watchdog controller. > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> > Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > .../bindings/watchdog/zte,zx2967-wdt.txt | 32 ++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > create mode 100644 Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt > new file mode 100644 > index 0000000..06ce677 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt > @@ -0,0 +1,32 @@ > +ZTE zx2967 Watchdog timer > + > +Required properties: > + > +- compatible : should be one of the following. > + * zte,zx296718-wdt > +- reg : Specifies base physical address and size of the registers. > +- clocks : Pairs of phandle and specifier referencing the controller's clocks. > +- resets : Reference to the reset controller controlling the watchdog > + controller. > + > +Optional properties: > + > +- timeout-sec : Contains the watchdog timeout in seconds. > +- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog. > + if we don't want to restart system when watchdog been triggered, > + it's not required, vice versa. > + It should include following fields. > + * phandle of aon-sysctrl. > + * offset of register that be written, should be 0xb0. > + * configure value that be written to aon-sysctrl. > + * bit mask, corresponding bits will be affected. > + > +Example: > + > +wdt: watchdog@1465000 { > + compatible = "zte,zx296718-wdt"; > + reg = <0x1465000 0x1000>; > + clocks = <&topcrm WDT_WCLK>; > + resets = <&toprst 35>; > + zte,wdt-reset-sysctrl = <&aon_sysctrl 0xb0 1 0x115>; > +}; > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Guenter, On Sat, Feb 04, 2017 at 08:29:27PM -0800, Guenter Roeck wrote: > Yes. One of the problems is that the patch doesn't apply to my tree > (which is based on v4.10-rc3), and it doesn't have a common anchestor, > meaning it is most likely not based on mainline. I would prefer to avoid > conflicts with the arm tree if possible. Understood. You only need to handle patch #1 and #3, and we will sort out MAINTAINERS update separately. Thanks. Shawn -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt new file mode 100644 index 0000000..06ce677 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt @@ -0,0 +1,32 @@ +ZTE zx2967 Watchdog timer + +Required properties: + +- compatible : should be one of the following. + * zte,zx296718-wdt +- reg : Specifies base physical address and size of the registers. +- clocks : Pairs of phandle and specifier referencing the controller's clocks. +- resets : Reference to the reset controller controlling the watchdog + controller. + +Optional properties: + +- timeout-sec : Contains the watchdog timeout in seconds. +- zte,wdt-reset-sysctrl : Directs how to reset system by the watchdog. + if we don't want to restart system when watchdog been triggered, + it's not required, vice versa. + It should include following fields. + * phandle of aon-sysctrl. + * offset of register that be written, should be 0xb0. + * configure value that be written to aon-sysctrl. + * bit mask, corresponding bits will be affected. + +Example: + +wdt: watchdog@1465000 { + compatible = "zte,zx296718-wdt"; + reg = <0x1465000 0x1000>; + clocks = <&topcrm WDT_WCLK>; + resets = <&toprst 35>; + zte,wdt-reset-sysctrl = <&aon_sysctrl 0xb0 1 0x115>; +};