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

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

[Stephen Rothwell]

[-- 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 --]

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

[Bjorn Andersson]

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

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

[Greg KH]

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

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

[Bjorn Andersson]

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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")

from the qcom tree and commit:

  1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")

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 arch/arm64/configs/defconfig
index 989183c76ae0,7eb5b6df594e..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -936,8 -922,8 +936,9 @@@ CONFIG_USB_SERIAL=
  CONFIG_USB_SERIAL_CP210X=m
  CONFIG_USB_SERIAL_FTDI_SIO=m
  CONFIG_USB_SERIAL_OPTION=m
 +CONFIG_USB_QCOM_EUD=m
  CONFIG_USB_HSIC_USB3503=y
+ CONFIG_USB_ONBOARD_HUB=m
  CONFIG_NOP_USB_XCEIV=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_RENESAS_USBHS_UDC=m
@@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
  CONFIG_TYPEC_FUSB302=m
  CONFIG_TYPEC_TPS6598X=m
  CONFIG_TYPEC_HD3SS3220=m
 +CONFIG_TYPEC_MUX_GPIO_SBU=m
+ CONFIG_TYPEC_UCSI=m
+ CONFIG_UCSI_CCG=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y

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

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

[Greg KH]

On Tue, Feb 14, 2023 at 12:40:01PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/configs/defconfig
> 
> between commit:
> 
>   85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")
> 
> from the qcom tree and commit:
> 
>   1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")
> 
> 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.

Merge looks good, thanks!

greg k-h

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

[Geert Uytterhoeven]

Hi Stephen,

On Tue, Feb 14, 2023 at 2:47 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the usb tree got a conflict in:
>
>   arch/arm64/configs/defconfig
>
> between commit:
>
>   85d81e15862a ("arm64: defconfig: Enable DisplayPort on SC8280XP laptops")
>
> from the qcom tree and commit:
>
>   1f6d59f7f82d ("arm64: defconfig: Enable UCSI support")
>
> 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.

Thanks for your resolution!

> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@@ -960,7 -946,8 +961,9 @@@ CONFIG_TYPEC_TCPCI=
>   CONFIG_TYPEC_FUSB302=m
>   CONFIG_TYPEC_TPS6598X=m
>   CONFIG_TYPEC_HD3SS3220=m
>  +CONFIG_TYPEC_MUX_GPIO_SBU=m
> + CONFIG_TYPEC_UCSI=m
> + CONFIG_UCSI_CCG=m

CONFIG_TYPEC_MUX_GPIO_SBU=m should be last, cfr.
drivers/usb/typec/Kconfig:source "drivers/usb/typec/ucsi/Kconfig"
drivers/usb/typec/Kconfig:source "drivers/usb/typec/mux/Kconfig"

>   CONFIG_MMC=y
>   CONFIG_MMC_BLOCK_MINORS=32
>   CONFIG_MMC_ARMMMCI=y

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[broonie]

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)

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

[Greg KH]

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 :)

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

[Stephen Rothwell]

[-- 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 --]

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

[Greg KH]

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

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

[Stephen Rothwell]

[-- 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 --]

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

[Stephen Rothwell]

[-- Attachment #1.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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

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

[Mark Brown]

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

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

[Mark Brown]

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;
+	};
+};