| Message ID | 20191122125402.14730-1-arnaud.pouliquen@st.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 71bbcd2eaf042ec3f10122e3f3b1be67dbfb1c16 |
| Headers | show |
| Series | dt-bindings: remoteproc: stm32: add wakeup-source property | expand |
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 <arnaud.pouliquen@st.com> > --- > 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
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.
If the optional wdg interrupt is defined, then this property may be defined. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> --- 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(+)