LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the usb tree with the qcom tree
@ 2021-08-06 14:13 Mark Brown
  0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2021-08-06 14:13 UTC (permalink / raw)
  To: Greg KH
  Cc: Bjorn Andersson, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Sandeep Maheswaram, Shaik Sajida Bhanu

Hi all,

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

  arch/arm64/boot/dts/qcom/sc7280.dtsi

between commit:

  298c81a7d44f ("arm64: dts: qcom: sc7280: Add nodes for eMMC and SD card")

from the qcom tree and commit:

  bb9efa59c665 ("arm64: dts: qcom: sc7280: Add USB related nodes")

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.

diff --cc arch/arm64/boot/dts/qcom/sc7280.dtsi
index 53a21d086178,cd6908f3fd09..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2022-02-10  8:02 ` Greg KH
@ 2022-03-18  7:37   ` Stephen Rothwell
  0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2022-03-18  7:37 UTC (permalink / raw)
  To: Greg KH, Olof Johansson, Arnd Bergmann
  Cc: Andy Gross, Baruch Siach, Bjorn Andersson,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Sean Anderson, ARM

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

Hi all,

On Thu, 10 Feb 2022 09:02:18 +0100 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Feb 10, 2022 at 02:11:00PM +1100, Stephen Rothwell wrote:
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > 
> > between commit:
> > 
> >   d1c10ab1494f ("arm64: dts: qcom: ipq6018: fix usb reference period")
> > 
> > from the qcom tree and commit:
> > 
> >   5726079cd486 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> > 
> > from the usb tree.
> > 
> > I fixed it up (I just use the latter) 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  
> 
> 
> That is fine, thanks.

This is now a conflict between the usb tree and the arm-soc tree.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2022-02-21 19:16 broonie
@ 2022-02-22  7:44 ` Greg KH
  0 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2022-02-22  7:44 UTC (permalink / raw)
  To: broonie
  Cc: Baruch Siach, Bjorn Andersson, Linux Kernel Mailing List,
	Linux Next Mailing List, Sean Anderson

On Mon, Feb 21, 2022 at 07:16:41PM +0000, broonie@kernel.org wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> between commit:
> 
>   d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period")
> 
> from the qcom tree and commit:
> 
>   5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> 
> 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.
> 
> diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi
> index 4e7efa97724bd,a614b9f73e2cd..0000000000000
> --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> (deleted the property updated by the qcom patch)

Deleted files are good :)

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

* linux-next: manual merge of the usb tree with the qcom tree
@ 2022-02-21 19:16 broonie
  2022-02-22  7:44 ` Greg KH
  0 siblings, 1 reply; 11+ messages in thread
From: broonie @ 2022-02-21 19:16 UTC (permalink / raw)
  To: Greg KH
  Cc: Baruch Siach, Bjorn Andersson, Greg Kroah-Hartman,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Sean Anderson

Hi all,

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

  arch/arm64/boot/dts/qcom/ipq6018.dtsi

between commit:

  d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period")

from the qcom tree and commit:

  5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")

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.

diff --cc arch/arm64/boot/dts/qcom/ipq6018.dtsi
index 4e7efa97724bd,a614b9f73e2cd..0000000000000
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi

(deleted the property updated by the qcom patch)

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2022-02-10  3:11 Stephen Rothwell
@ 2022-02-10  8:02 ` Greg KH
  2022-03-18  7:37   ` Stephen Rothwell
  0 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2022-02-10  8:02 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andy Gross, Baruch Siach, Bjorn Andersson,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Sean Anderson

On Thu, Feb 10, 2022 at 02:11:00PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> between commit:
> 
>   d1c10ab1494f ("arm64: dts: qcom: ipq6018: fix usb reference period")
> 
> from the qcom tree and commit:
> 
>   5726079cd486 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
> 
> from the usb tree.
> 
> I fixed it up (I just use the latter) 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


That is fine, thanks.

greg k-h

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

* linux-next: manual merge of the usb tree with the qcom tree
@ 2022-02-10  3:11 Stephen Rothwell
  2022-02-10  8:02 ` Greg KH
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2022-02-10  3:11 UTC (permalink / raw)
  To: Greg KH, Andy Gross
  Cc: Baruch Siach, Bjorn Andersson, Greg Kroah-Hartman,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Sean Anderson

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

Hi all,

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

  arch/arm64/boot/dts/qcom/ipq6018.dtsi

between commit:

  d1c10ab1494f ("arm64: dts: qcom: ipq6018: fix usb reference period")

from the qcom tree and commit:

  5726079cd486 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")

from the usb tree.

I fixed it up (I just use the latter) 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 --]

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2021-09-21 13:16   ` Greg KH
@ 2021-09-21 13:28     ` Bjorn Andersson
  0 siblings, 0 replies; 11+ messages in thread
From: Bjorn Andersson @ 2021-09-21 13:28 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Andy Gross, Baruch Siach, Kathiravan T,
	Linux Kernel Mailing List, Linux Next Mailing List

On Tue 21 Sep 06:16 PDT 2021, Greg KH wrote:

> On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote:
> > On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote:
> > 
> > > Hi all,
> > > 
> > > Today's linux-next merge of the usb tree got a conflict in:
> > > 
> > >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > > 
> > > between commit:
> > > 
> > >   261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
> > > 
> > > from the qcom tree and commit:
> > > 
> > >   9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
> > > 
> > 
> > Greg, this is not a USB patch, can you please drop it from your tree.
> 
> It was sent to me and says "add usb3 DT description", so how am I
> supposed to know to reject it?
> 

It's a dts patch and as we saw in the last cycle bringing in patches
through other trees has a strong tendency to result in merge conflicts
down the road.

It seems like the patch was sent in a series together with driver
changes, so I presume you took the whole series. Unfortunately it's
quite common for these platform enablement efforts to be spread across
multiple subsystems and we keep seeing the series be grouped by function
rather than maintainer...

Not sure if there's anything to do about this.

> I'll go revert it from my tree.  {sigh}
> 

Thanks!

Regards,
Bjorn

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2021-09-21 13:12 ` Bjorn Andersson
@ 2021-09-21 13:16   ` Greg KH
  2021-09-21 13:28     ` Bjorn Andersson
  0 siblings, 1 reply; 11+ messages in thread
From: Greg KH @ 2021-09-21 13:16 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Stephen Rothwell, Andy Gross, Baruch Siach, Kathiravan T,
	Linux Kernel Mailing List, Linux Next Mailing List

On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote:
> On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > 
> > between commit:
> > 
> >   261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
> > 
> > from the qcom tree and commit:
> > 
> >   9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
> > 
> 
> Greg, this is not a USB patch, can you please drop it from your tree.

It was sent to me and says "add usb3 DT description", so how am I
supposed to know to reject it?

I'll go revert it from my tree.  {sigh}

greg k-h

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

* Re: linux-next: manual merge of the usb tree with the qcom tree
  2021-09-21  2:30 Stephen Rothwell
@ 2021-09-21 13:12 ` Bjorn Andersson
  2021-09-21 13:16   ` Greg KH
  0 siblings, 1 reply; 11+ messages in thread
From: Bjorn Andersson @ 2021-09-21 13:12 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Andy Gross, Baruch Siach, Greg Kroah-Hartman,
	Kathiravan T, Linux Kernel Mailing List, Linux Next Mailing List

On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> 
> between commit:
> 
>   261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
> 
> from the qcom tree and commit:
> 
>   9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
> 

Greg, this is not a USB patch, can you please drop it from your tree.

Thanks,
Bjorn

> from the usb tree.
> 
> Same author, same date, but the former has this committer comment:
> 
> bjorn: Changed dwc3 node name to usb, per binding
> 
> So I used that version.
> 
> I fixed it up (see above) 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



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

* linux-next: manual merge of the usb tree with the qcom tree
@ 2021-09-21  2:30 Stephen Rothwell
  2021-09-21 13:12 ` Bjorn Andersson
  0 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2021-09-21  2:30 UTC (permalink / raw)
  To: Greg KH, Andy Gross
  Cc: Baruch Siach, Bjorn Andersson, Greg Kroah-Hartman, Kathiravan T,
	Linux Kernel Mailing List, Linux Next Mailing List

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

Hi all,

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

  arch/arm64/boot/dts/qcom/ipq6018.dtsi

between commit:

  261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")

from the qcom tree and commit:

  9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")

from the usb tree.

Same author, same date, but the former has this committer comment:

bjorn: Changed dwc3 node name to usb, per binding

So I used that version.

I fixed it up (see above) 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 --]

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

* linux-next: manual merge of the usb tree with the qcom tree
@ 2021-08-06 14:09 Mark Brown
  0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2021-08-06 14:09 UTC (permalink / raw)
  To: Greg KH
  Cc: Bjorn Andersson, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Sandeep Maheswaram, satya priya

Hi all,

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

  arch/arm64/boot/dts/qcom/sc7280-idp.dts

between commit:

  7dfb52dcc5a4 ("arm64: dts: qcom: sc7280: Remove pm8350 and pmr735b for sc7280-idp")

from the qcom tree and commit:

  73cb0912894b ("arm64: dts: qcom: sc7280: Add USB nodes for IDP board")

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.


diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 64fc22aff33d..894c3e92a0d7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -68,3 +68,62 @@
 		qcom,pre-scaling = <1 1>;
 	};
 };
+
+&uart5 {
+	status = "okay";
+};
+
+&usb_1 {
+	status = "okay";
+};
+
+&usb_1_dwc3 {
+	dr_mode = "host";
+};
+
+&usb_1_hsphy {
+	status = "okay";
+
+	vdda-pll-supply = <&vreg_l10c_0p8>;
+	vdda33-supply = <&vreg_l2b_3p0>;
+	vdda18-supply = <&vreg_l1c_1p8>;
+};
+
+&usb_1_qmpphy {
+	status = "okay";
+
+	vdda-phy-supply = <&vreg_l6b_1p2>;
+	vdda-pll-supply = <&vreg_l1b_0p8>;
+};
+
+&usb_2 {
+	status = "okay";
+};
+
+&usb_2_dwc3 {
+	dr_mode = "peripheral";
+};
+
+&usb_2_hsphy {
+	status = "okay";
+
+	vdda-pll-supply = <&vreg_l10c_0p8>;
+	vdda33-supply = <&vreg_l2b_3p0>;
+	vdda18-supply = <&vreg_l1c_1p8>;
+};
+
+/* PINCTRL - additions to nodes defined in sc7280.dtsi */
+
+&qup_uart5_default {
+	tx {
+		pins = "gpio46";
+		drive-strength = <2>;
+		bias-disable;
+	};
+
+	rx {
+		pins = "gpio47";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
+};

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

end of thread, other threads:[~2022-03-18  7:37 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06 14:13 linux-next: manual merge of the usb tree with the qcom tree Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2022-02-21 19:16 broonie
2022-02-22  7:44 ` Greg KH
2022-02-10  3:11 Stephen Rothwell
2022-02-10  8:02 ` Greg KH
2022-03-18  7:37   ` Stephen Rothwell
2021-09-21  2:30 Stephen Rothwell
2021-09-21 13:12 ` Bjorn Andersson
2021-09-21 13:16   ` Greg KH
2021-09-21 13:28     ` Bjorn Andersson
2021-08-06 14:09 Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).