linux-next: manual merge of the devicetree tree with the usb tree

* linux-next: manual merge of the devicetree tree with the usb tree
@ 2023-12-18  5:48 Stephen Rothwell
  2023-12-18 10:26 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-12-18  5:48 UTC (permalink / raw)
  To: Rob Herring, Greg KH
  Cc: Dmitry Baryshkov, Greg Kroah-Hartman, Kyle Tso,
	Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 3146 bytes --]

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 description")
  d1756ac67e7f ("dt-bindings: connector: usb: add altmodes description")

from the usb tree and commit:

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

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.

-- 
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
  
-   op-sink-microwatt:
-     description: Sink required operating power in microwatt, if source can't
-       offer the power, Capability Mismatch is set. Required for power sink and
-       power dual role.
- 
 +  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 means 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 connector 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.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread