2019-11-22 12:58:41

by Arnaud POULIQUEN

Subject: [PATCH] dt-bindings: remoteproc: stm32: add wakeup-source property

If the optional wdg interrupt is defined, then this property
may be defined.

Signed-off-by: Arnaud Pouliquen <[email protected]>
---
This commit is related to the merge conflict issue reported by
Stephen Rothwell: https://lkml.org/lkml/2019/11/21/1168
---
.../devicetree/bindings/remoteproc/st,stm32-rproc.yaml | 2 ++
1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml b/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml
index acf18d170352..c0d83865e933 100644
--- a/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml
+++ b/Documentation/devicetree/bindings/remoteproc/st,stm32-rproc.yaml
@@ -50,6 +50,8 @@ properties:
description: Should contain the WWDG1 watchdog reset interrupt
maxItems: 1

+ wakeup-source: true
+
mboxes:
description:
This property is required only if the rpmsg/virtio functionality is used.
--
2.17.1

2019-12-04 22:23:48

by Rob Herring (Arm)

Subject: Re: [PATCH] dt-bindings: remoteproc: stm32: add wakeup-source property

On Fri, 22 Nov 2019 13:54:02 +0100, Arnaud Pouliquen wrote:
> If the optional wdg interrupt is defined, then this property
> may be defined.
>
> Signed-off-by: Arnaud Pouliquen <[email protected]>
> ---
> This commit is related to the merge conflict issue reported by
> Stephen Rothwell: https://lkml.org/lkml/2019/11/21/1168
> ---
> .../devicetree/bindings/remoteproc/st,stm32-rproc.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>

Applied, thanks.

Rob