Subject: linux-next: manual merge of the i2c tree with the arm-soc tree

From: Mark Brown <[email-masked]>
Date: Mon, 15 Sep 2025 18:50:45 +0100

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