Received-SPF: pass (google.com: domain of linux-kernel+bounces-3013-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 18 Dec 2023 16:48:12 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Greg KH <greg@kroah.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Greg Kroah-Hartman
 <gregkh@linuxfoundation.org>, Kyle Tso <kyletso@google.com>, Linux Kernel
 Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the usb tree
Message-ID: <20231218164812.327db2af@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/TpXr3zQnUF_Qfml_0=hY_HS";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/TpXr3zQnUF_Qfml_0=hY_HS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/connector/usb-connector.yaml

between commits:

  76cd718a9ffd ("dt-bindings: connector: usb: add accessory mode descriptio=
n")
  d1756ac67e7f ("dt-bindings: connector: usb: add altmodes description")

from the usb tree and commit:

  0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD ca=
pabilities")

from the devicetree 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.

--=20
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/connector/usb-connector.yaml
index f5966b3a2d9a,5a93cdb9fdbc..000000000000
--- a/Documentation/devicetree/bindings/connector/usb-connector.yaml
+++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml
@@@ -166,49 -141,6 +141,44 @@@ properties
      maxItems: 6
      $ref: /schemas/types.yaml#/definitions/uint32-array
 =20
-   op-sink-microwatt:
-     description: Sink required operating power in microwatt, if source ca=
n't
-       offer the power, Capability Mismatch is set. Required for power sin=
k and
-       power dual role.
-=20
 +  accessory-mode-audio:
 +    type: boolean
 +    description: Whether the device supports Audio Adapter Accessory Mode=
. This
 +      is only necessary if there are no other means to discover supported
 +      alternative modes (e.g. through the UCSI firmware interface).
 +
 +  accessory-mode-debug:
 +    type: boolean
 +    description: Whether the device supports Debug Accessory Mode. This
 +      is only necessary if there are no other means to discover supported
 +      alternative modes (e.g. through the UCSI firmware interface).
 +
 +  altmodes:
 +    type: object
 +    description: List of Alternative Modes supported by the schematics on=
 the
 +      particular device. This is only necessary if there are no other mea=
ns to
 +      discover supported alternative modes (e.g. through the UCSI firmware
 +      interface).
 +
 +    additionalProperties: false
 +
 +    patternProperties:
 +      "^(displayport)$":
 +        type: object
 +        description:
 +          A single USB-C Alternative Mode as supported by the USB-C conne=
ctor logic.
 +
 +        additionalProperties: false
 +
 +        properties:
 +          svid:
 +            $ref: /schemas/types.yaml#/definitions/uint16
 +            description: Unique value assigned by USB-IF to the Vendor / =
AltMode.
 +            enum: [ 0xff01 ]
 +          vdo:
 +            $ref: /schemas/types.yaml#/definitions/uint32
 +            description: VDO returned by Discover Modes USB PD command.
 +
    port:
      $ref: /schemas/graph.yaml#/properties/port
      description: OF graph bindings modeling a data bus to the connector, =
e.g.

--Sig_/TpXr3zQnUF_Qfml_0=hY_HS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV/3RwACgkQAVBC80lX
0GzA7Qf+Lo4E+AtV95EJ9wbkn8X8Lqlfa/tf45BG+CiononD0HBknFipzc26RiUa
ap1lzfDg9zzP1CRStffg5XzLxBJMloENVGjT/biAk7JEg+tqBZ2AGwDdKExr7Qdn
chiH7vscqgGi+JO8i3bnz+OLxZWRIYL8WyQ9f1Hjo+0e3non32XRP+rN9Wn/M3v7
emgRqvEQENj2Q5WpAFRdyIMLBS4IXN/0NvQq1WSaA+P9ovqVlXwQeLs4dMXL75Yc
KrO3aHAQ7nICA+1ToeERvJt9abAHUBO+6+PDDn7qAEqQuIGYDm63mDh+l2F61M8b
1Y++4qOl3wY5s0G/9CEULRGDRe2NIQ==
=9+k4
-----END PGP SIGNATURE-----

--Sig_/TpXr3zQnUF_Qfml_0=hY_HS--