From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>,
Wim Van Sebroeck <wim@iguana•be>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Anson Huang <Anson.Huang@nxp•com>, Peng Fan <peng.fan@nxp•com>,
Srinivas Kandagatla <srinivas.kandagatla@linaro•org>
Subject: linux-next: manual merge of the char-misc tree with the watchdog tree
Date: Tue, 9 Jul 2019 18:21:53 +1000 [thread overview]
Message-ID: <20190709182153.4ee49f62@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2018 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
between commit:
8c21ead3ea5d ("dt-bindings: watchdog: move i.MX system controller watchdog binding to SCU")
from the watchdog tree and commit:
c2a6ea23a401 ("dt-bindings: fsl: scu: add ocotp binding")
from the char-misc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
index 1b56557df521,f378922906f6..000000000000
--- a/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
+++ b/Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt
@@@ -133,16 -133,18 +133,28 @@@ RTC bindings based on SCU Message Proto
Required properties:
- compatible: should be "fsl,imx8qxp-sc-rtc";
+Watchdog bindings based on SCU Message Protocol
+------------------------------------------------------------
+
+Required properties:
+- compatible: should be:
+ "fsl,imx8qxp-sc-wdt"
+ followed by "fsl,imx-sc-wdt";
+Optional properties:
+- timeout-sec: contains the watchdog timeout in seconds.
+
+ OCOTP bindings based on SCU Message Protocol
+ ------------------------------------------------------------
+ Required properties:
+ - compatible: Should be "fsl,imx8qxp-scu-ocotp"
+ - #address-cells: Must be 1. Contains byte index
+ - #size-cells: Must be 1. Contains byte length
+
+ Optional Child nodes:
+
+ - Data cells of ocotp:
+ Detailed bindings are described in bindings/nvmem/nvmem.txt
+
Example (imx8qxp):
-------------
aliases {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-07-09 8:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709182153.4ee49f62@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Anson.Huang@nxp$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peng.fan@nxp$(echo .)com \
--cc=srinivas.kandagatla@linaro$(echo .)org \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox