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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb:
chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the
devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx"
infix") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/chipidea/Makefile
index 4113feb,3bbbcba..0000000
--- a/drivers/usb/chipidea/Makefile
+++ b/drivers/usb/chipidea/Makefile
@@@ -13,9 -13,9 +13,9 @@@ obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_m
  
  # PCI doesn't provide stubs, need to check
  ifneq ($(CONFIG_PCI),)
- 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_pci.o
+ 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_pci.o
  endif
  
 -ifneq ($(CONFIG_OF_DEVICE),)
 +ifneq ($(CONFIG_OF),)
- 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx.o
+ 	obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_imx.o usbmisc_imx.o
  endif

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Greg KH]

On Tue, Jun 25, 2013 at 04:53:10PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb:
> chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the
> devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx"
> infix") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me, thanks,

greg k-h

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

[Greg KH]

On Wed, Oct 18, 2023 at 01:13:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
> 
> between commit:
> 
>   47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties")
> 
> from the devicetree tree and commit:
> 
>   6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")
> 
> from the usb 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.

Looks good, thanks!

greg k-h

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/usb/ti,tps6598x.yaml

between commit:

  47b8fb4aef95 ("dt-bindings: usb: ti,tps6598x: Disallow undefined properties")

from the devicetree tree and commit:

  6060d554e891 ("dt-bindings: usb: tps6598x: Add tps25750")

from the usb 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/ti,tps6598x.yaml
index 6ab674dea4c6,72ac534e6ed2..000000000000
--- a/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
+++ b/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
@@@ -32,14 -47,43 +47,46 @@@ properties
      items:
        - const: irq
  
 +  connector:
 +    $ref: /schemas/connector/usb-connector.yaml#
 +
+   firmware-name:
+     description: |
+       Should contain the name of the default patch binary
+       file located on the firmware search path which is
+       used to switch the controller into APP mode.
+       This is used when tps25750 doesn't have an EEPROM
+       connected to it.
+     maxItems: 1
+ 
  required:
    - compatible
    - reg
  
+ allOf:
+   - if:
+       properties:
+         compatible:
+           contains:
+             const: ti,tps25750
+     then:
+       properties:
+         reg:
+           maxItems: 2
+ 
+         connector:
+           required:
+             - data-role
+ 
+       required:
+         - connector
+         - reg-names
+     else:
+       properties:
+         reg:
+           maxItems: 1
+ 
 -additionalProperties: true
 +additionalProperties: false
  
  examples:
    - |

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

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

[Felipe Balbi]

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


Hi,

Rob Herring <robherring2@gmail.com> writes:

>> >> > > > Today's linux-next merge of the usb tree got a conflict in:
>> >> > > >
>> >> > > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
>> >> > > >
>> >> > > > between commit:
>> >> > > >
>> >> > > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
>> >> > > >
>> >> > > > from the devicetree tree and commits:
>> >> > > >
>> >> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
>> >> > > >
>> >> > > > from the usb tree.
>> >> > > >
>> >> > > > I fixed it up (I guessed, taking most changes from the former) 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.
>> >> >
>> >> > Ugg, I fixed up a warning on my side...
>> >> >
>> >> > >
>> >> > > Sounds good,t hanks.
>> >> >
>> >> > Greg, can you revert your copy and we can get rid of the conflict.
>>
>> Did things change recently? I always got the message from DT folks that
>> DT changes should go via the driver tree. Has that changed? I can stop
>> taking DT patches, no problem.
>
> Not really. Mainly, I've been taking some schema conversions as they
> tend to be standalone patches and to make sure they validate (this one
> had a warning which I fixed up and that caused the conflict). Most
> bindings don't see multiple updates in a cycle, but this one has
> obviously become a mess.
>
> If it has my Reviewed/Acked-by, then I'm not taking it. If I applied,
> then I've replied saying I did.

fair enough, I may have missed your reply and ended up taking the patch
together with a bigger series.

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Rob Herring]

On Fri, May 29, 2020 at 2:44 AM Felipe Balbi <balbi@kernel.org> wrote:
>
>
> Hi,
>
> Greg KH <greg@kroah.com> writes:
> > On Fri, May 29, 2020 at 10:26:41AM +0200, Greg KH wrote:
> >> On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
> >> > On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
> >> > >
> >> > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> >> > > > Hi all,
> >> > > >
> >> > > > Today's linux-next merge of the usb tree got a conflict in:
> >> > > >
> >> > > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> >> > > >
> >> > > > between commit:
> >> > > >
> >> > > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >> > > >
> >> > > > from the devicetree tree and commits:
> >> > > >
> >> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >> > > >
> >> > > > from the usb tree.
> >> > > >
> >> > > > I fixed it up (I guessed, taking most changes from the former) 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.
> >> >
> >> > Ugg, I fixed up a warning on my side...
> >> >
> >> > >
> >> > > Sounds good,t hanks.
> >> >
> >> > Greg, can you revert your copy and we can get rid of the conflict.
>
> Did things change recently? I always got the message from DT folks that
> DT changes should go via the driver tree. Has that changed? I can stop
> taking DT patches, no problem.

Not really. Mainly, I've been taking some schema conversions as they
tend to be standalone patches and to make sure they validate (this one
had a warning which I fixed up and that caused the conflict). Most
bindings don't see multiple updates in a cycle, but this one has
obviously become a mess.

If it has my Reviewed/Acked-by, then I'm not taking it. If I applied,
then I've replied saying I did.

Rob

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

[Felipe Balbi]

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


Hi,

Greg KH <greg@kroah.com> writes:
> On Fri, May 29, 2020 at 10:26:41AM +0200, Greg KH wrote:
>> On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
>> > On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
>> > >
>> > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
>> > > > Hi all,
>> > > >
>> > > > Today's linux-next merge of the usb tree got a conflict in:
>> > > >
>> > > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
>> > > >
>> > > > between commit:
>> > > >
>> > > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
>> > > >
>> > > > from the devicetree tree and commits:
>> > > >
>> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
>> > > >
>> > > > from the usb tree.
>> > > >
>> > > > I fixed it up (I guessed, taking most changes from the former) 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.
>> > 
>> > Ugg, I fixed up a warning on my side...
>> > 
>> > >
>> > > Sounds good,t hanks.
>> > 
>> > Greg, can you revert your copy and we can get rid of the conflict.

Did things change recently? I always got the message from DT folks that
DT changes should go via the driver tree. Has that changed? I can stop
taking DT patches, no problem.

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Greg KH]

On Fri, May 29, 2020 at 10:26:41AM +0200, Greg KH wrote:
> On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
> > On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
> > >
> > > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the usb tree got a conflict in:
> > > >
> > > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> > > >
> > > > between commit:
> > > >
> > > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> > > >
> > > > from the devicetree tree and commits:
> > > >
> > > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> > > >
> > > > from the usb tree.
> > > >
> > > > I fixed it up (I guessed, taking most changes from the former) 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.
> > 
> > Ugg, I fixed up a warning on my side...
> > 
> > >
> > > Sounds good,t hanks.
> > 
> > Greg, can you revert your copy and we can get rid of the conflict.
> 
> I can, if you also add the attached patch to your tree, as it was a
> follow-on one from the original one and I had to revert it too.

Also this one as well.

---------------------

From b88035625ec9594d4554a307e820aef4b759e35f Mon Sep 17 00:00:00 2001
From: Sandeep Maheswaram <sanm@codeaurora.org>
Date: Thu, 26 Mar 2020 12:36:08 +0530
Subject: [PATCH] dt-bindings: usb: qcom,dwc3: Add compatible for SC7180

Add compatible for SC7180 in usb dwc3 bindings.

Signed-off-by: Sandeep Maheswaram <sanm@codeaurora.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
index 0f69475566c7..17e22ff528dd 100644
--- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
@@ -16,6 +16,7 @@ properties:
       - enum:
           - qcom,msm8996-dwc3
           - qcom,msm8998-dwc3
+          - qcom,sc7180-dwc3
           - qcom,sdm845-dwc3
       - const: qcom,dwc3
 

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

[Greg KH]

On Thu, May 28, 2020 at 08:14:36AM -0600, Rob Herring wrote:
> On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the usb tree got a conflict in:
> > >
> > >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> > >
> > > between commit:
> > >
> > >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> > >
> > > from the devicetree tree and commits:
> > >
> > >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> > >
> > > from the usb tree.
> > >
> > > I fixed it up (I guessed, taking most changes from the former) 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.
> 
> Ugg, I fixed up a warning on my side...
> 
> >
> > Sounds good,t hanks.
> 
> Greg, can you revert your copy and we can get rid of the conflict.

I can, if you also add the attached patch to your tree, as it was a
follow-on one from the original one and I had to revert it too.

thanks,

greg k-h


-------------------

From 1805cdde37c8cc90b298c3d9afbc2aa4c9890635 Mon Sep 17 00:00:00 2001
From: Sandeep Maheswaram <sanm@codeaurora.org>
Date: Wed, 1 Apr 2020 10:45:42 +0530
Subject: [PATCH] dt-bindings: usb: qcom,dwc3: Introduce interconnect
 properties for Qualcomm DWC3 driver

Add documentation for the interconnects and interconnect-names
properties for USB.

Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Sandeep Maheswaram <sanm@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
index 17e22ff528dd..ec1ec47b51cb 100644
--- a/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
+++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
@@ -70,6 +70,14 @@ properties:
   resets:
     maxItems: 1
 
+  interconnects:
+    maxItems: 2
+
+  interconnect-names:
+    items:
+      - const: usb-ddr
+      - const: apps-usb
+
   interrupts:
     items:
       - description: The interrupt that is asserted

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

[Rob Herring]

On Thu, May 28, 2020 at 4:49 AM Greg KH <greg@kroah.com> wrote:
>
> On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the usb tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> >
> > between commit:
> >
> >   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >
> > from the devicetree tree and commits:
> >
> >   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> >
> > from the usb tree.
> >
> > I fixed it up (I guessed, taking most changes from the former) 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.

Ugg, I fixed up a warning on my side...

>
> Sounds good,t hanks.

Greg, can you revert your copy and we can get rid of the conflict.

Rob

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

[Greg KH]

On Thu, May 28, 2020 at 04:22:15PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   Documentation/devicetree/bindings/usb/qcom,dwc3.yaml
> 
> between commit:
> 
>   3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> 
> from the devicetree tree and commits:
> 
>   cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")
> 
> from the usb tree.
> 
> I fixed it up (I guessed, taking most changes from the former) 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.

Sounds good,t hanks.

greg k-h

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

between commit:

  3828026c9ec8 ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")

from the devicetree tree and commits:

  cd4b54e2ae1f ("dt-bindings: usb: qcom,dwc3: Convert USB DWC3 bindings")

from the usb tree.

I fixed it up (I guessed, taking most changes from the former) 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

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