Hi all,
On Mon, 16 Mar 2020 14:14:36 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> Documentation/devicetree/bindings/usb/generic.txt
>
> between commit:
>
> 431a30b7d495 ("dt-bindings: Convert usb-connector to YAML format.")
>
> from the devicetree tree and commit:
>
> dd2d0d1fac2b ("dt-bindings: usb: generic: Add role-switch-default-mode binding")
>
> from the usb-gadget 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/usb/generic.txt
> index 474e74c06522,67c51759a642..000000000000
> --- a/Documentation/devicetree/bindings/usb/generic.txt
> +++ b/Documentation/devicetree/bindings/usb/generic.txt
> @@@ -34,7 -34,13 +34,13 @@@ Optional properties
> - usb-role-switch: boolean, indicates that the device is capable of assigning
> the USB data role (USB host or USB device) for a given
> USB connector, such as Type-C, Type-B(micro).
> - see connector/usb-connector.txt.
> + see connector/usb-connector.yaml.
> + - role-switch-default-mode: indicating if usb-role-switch is enabled, the
> + device default operation mode of controller while usb
> + role is USB_ROLE_NONE. Valid arguments are "host" and
> + "peripheral". Defaults to "peripheral" if not
> + specified.
> +
>
> This is an attribute to a USB controller such as:
>
This is now a conflict between the usb tree and the devicetree tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpPrhMNwGX0_.pgp
Description: OpenPGP digital signature
