From: Mark Brown <broonie@kernel.org>
To: Wolfram Sang <wsa@kernel.org>
Cc: Akhil R <akhilrajeev@nvidia.com>,
Kartik Rajput <kkartik@nvidia.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Thierry Reding <treding@nvidia.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: linux-next: manual merge of the i2c tree with the arm-soc tree
Date: Mon, 15 Sep 2025 18:50:45 +0100 [thread overview]
Message-ID: <aMhR9TJm5V5EqaoC@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2173 bytes --]
Hi all,
's linux-next merge of the i2c tree got a conflict in:
Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
between commit:
804ebc2bdcc85 ("dt-bindings: i2c: nvidia,tegra20-i2c: Document Tegra264 I2C")
from the arm-soc tree and commit:
69329daf16af7 ("dt-bindings: i2c: nvidia,tegra20-i2c: Add Tegra256 I2C compatible")
from the i2c 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.
diff --cc Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
index f0693b872cb6b,32c3b69ccf342..0000000000000
--- a/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml
@@@ -80,12 -80,11 +80,17 @@@ properties
support for 64 KiB transactions whereas earlier chips supported no
more than 4 KiB per transactions.
const: nvidia,tegra194-i2c
+ - description: |
+ Tegra256 has 8 generic I2C controllers. The controllers are similar to
+ the previous generations, but have a different parent clock and hence
+ the timing parameters are configured differently.
+ const: nvidia,tegra256-i2c
+ - description:
+ Tegra264 has 17 generic I2C controllers, two of which are in the AON
+ (always-on) partition of the SoC. In addition to the features from
+ Tegra194, a SW mutex register is added to support use of the same I2C
+ instance across multiple firmwares.
+ const: nvidia,tegra264-i2c
reg:
maxItems: 1
@@@ -192,7 -191,7 +197,11 @@@ allOf
contains:
enum:
- nvidia,tegra194-i2c
+ - nvidia,tegra256-i2c
+ - nvidia,tegra264-i2c
then:
required:
- resets
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-15 17:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-15 17:50 Mark Brown [this message]
2025-09-15 21:04 ` linux-next: manual merge of the i2c tree with the arm-soc tree Wolfram Sang
2025-09-15 22:13 ` Mark Brown
2025-09-16 21:46 ` Thierry Reding
2025-09-17 21:14 ` Wolfram Sang
2025-09-22 12:03 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2021-08-18 0:08 Stephen Rothwell
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=aMhR9TJm5V5EqaoC@sirena.org.uk \
--to=broonie@kernel.org \
--cc=akhilrajeev@nvidia.com \
--cc=kkartik@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=treding@nvidia.com \
--cc=wsa+renesas@sang-engineering.com \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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