linux-next: manual merge of the usb tree with the arm-soc tree

linux-next: manual merge of the usb tree with the arm-soc tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 2738 bytes --]

Hi all,

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

  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
  arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts

between commit:

  39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")

from the arm-soc tree and commit:

  1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")

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/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
index 30e3e769d2b4,bae85f6b2bfa..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
@@@ -14,17 -14,15 +14,6 @@@
  	compatible = "google,lazor-rev0", "qcom,sc7180";
  };
  
- &pp3300_hub {
- 	/* pp3300_l7c is used to power the USB hub */
- 	/delete-property/regulator-always-on;
- 	/delete-property/regulator-boot-on;
- };
- 
- &pp3300_l7c {
- 	regulator-always-on;
- 	regulator-boot-on;
 -/*
 - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is
 - * not supported by the PM6150 ADC driver. Disable the charger thermal zone
 - * to avoid using bogus temperature values.
 - */
 -&charger_thermal {
 -	status = "disabled";
--};
--
  &sn65dsi86_out {
  	/*
  	 * Lane 0 was incorrectly mapped on the cable, but we've now decided
diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
index c2ef06367baf,343ed457efb2..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
@@@ -14,13 -14,20 +14,10 @@@
  	compatible = "google,lazor-rev1", "google,lazor-rev2", "qcom,sc7180";
  };
  
- &pp3300_hub {
- 	/* pp3300_l7c is used to power the USB hub */
- 	/delete-property/regulator-always-on;
- 	/delete-property/regulator-boot-on;
 -/*
 - * Lazor is stuffed with a 47k NTC as charger thermistor which currently is
 - * not supported by the PM6150 ADC driver. Disable the charger thermal zone
 - * to avoid using bogus temperature values.
 - */
 -&charger_thermal {
 -	status = "disabled";
 -};
 -
 -
+ &usb_hub_2_0 {
+ 	 vdd-supply = <&pp3300_l7c>;
  };
  
- &pp3300_l7c {
- 	regulator-always-on;
- 	regulator-boot-on;
+ &usb_hub_3_0 {
+ 	 vdd-supply = <&pp3300_l7c>;
  };

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

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

[Matthias Kaehlcke]

On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got conflicts in:
> 
>   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
>   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
> 
> between commit:
> 
>   39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")
> 
> from the arm-soc tree and commit:
> 
>   1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")
> 
> 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 Stephen for fixing this up for -next!

One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor:
Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc
tree with the rest of the SC7180 device tree patches.

Greg/Bjorn, does the above sound like a suitable solution to you or do you
think it would be better to deal with the conflict in a different way?

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

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

[Bjorn Andersson]

On Thu 17 Jun 11:34 CDT 2021, Matthias Kaehlcke wrote:

> On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the usb tree got conflicts in:
> > 
> >   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
> >   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
> > 
> > between commit:
> > 
> >   39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")
> > 
> > from the arm-soc tree and commit:
> > 
> >   1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")
> > 
> > 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 Stephen for fixing this up for -next!
> 
> One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor:
> Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc
> tree with the rest of the SC7180 device tree patches.
> 
> Greg/Bjorn, does the above sound like a suitable solution to you or do you
> think it would be better to deal with the conflict in a different way?

Having the dts patch go through the Qualcomm tree instead would resolve
the issue.

I wasn't aware that the driver code had landed yet, so I haven't merged
the DT patch, but can do so and include it in the pull request that I'm
preparing for 5.14.

Greg, does that sound reasonable to you?

Regards,
Bjorn

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

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

[Greg KH]

On Thu, Jun 17, 2021 at 12:30:28PM -0500, Bjorn Andersson wrote:
> On Thu 17 Jun 11:34 CDT 2021, Matthias Kaehlcke wrote:
> 
> > On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > Today's linux-next merge of the usb tree got conflicts in:
> > > 
> > >   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
> > >   arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
> > > 
> > > between commit:
> > > 
> > >   39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")
> > > 
> > > from the arm-soc tree and commit:
> > > 
> > >   1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")
> > > 
> > > 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 Stephen for fixing this up for -next!
> > 
> > One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor:
> > Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc
> > tree with the rest of the SC7180 device tree patches.
> > 
> > Greg/Bjorn, does the above sound like a suitable solution to you or do you
> > think it would be better to deal with the conflict in a different way?
> 
> Having the dts patch go through the Qualcomm tree instead would resolve
> the issue.
> 
> I wasn't aware that the driver code had landed yet, so I haven't merged
> the DT patch, but can do so and include it in the pull request that I'm
> preparing for 5.14.
> 
> Greg, does that sound reasonable to you?

I will revert the dts change in my tree now, along with the rest of this
specific series, as it is causing other build issues in linux-next at
the moment.  That should resolve the merge issues now.

If you want to take the dts patch through your tree now, that's fine
with me.  Or we can wait until after 5.14-rc1 is out, which might make
things easier to handle.

thanks,

greg k-h

_______________________________________________
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 arm-soc tree

[Olof Johansson]

On Wed, Jul 23, 2014 at 11:33 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
>> PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
>> 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
>> the usb tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Also drivers/phy/Makefile
>
> --
> Cheers,
> Stephen Rothwell                    sfr at canb.auug.org.au
>
> diff --cc drivers/phy/Makefile
> index 241c741e6e39,971ad0aac388..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -18,8 -21,7 +21,10 @@@ phy-exynos-usb2-y                    += phy-samsung-usb2
>   phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
>   phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
>   phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o
>  +phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2)    += phy-s5pv210-usb2.o
>   obj-$(CONFIG_PHY_EXYNOS5_USBDRD)      += phy-exynos5-usbdrd.o
>   obj-$(CONFIG_PHY_XGENE)                       += phy-xgene.o
>  +obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY)  += phy-spear1310-miphy.o
>  +obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY)  += phy-spear1340-miphy.o
> + obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)   += phy-qcom-apq8064-sata.o
> + obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)   += phy-qcom-ipq806x-sata.o


We've both been sinners here. New entries should be added in
alphabetical order to avoid these conflicts, and neither of us caught
it.

Resolution looks OK though.


-Olof

linux-next: manual merge of the usb tree with the arm-soc tree

[Greg KH]

On Thu, Jul 24, 2014 at 04:33:29PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
> > PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
> > 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
> > the usb tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> Also drivers/phy/Makefile

Both look good, thanks.

greg k-h

linux-next: manual merge of the usb tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
> PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
> 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
> the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Also drivers/phy/Makefile

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

diff --cc drivers/phy/Makefile
index 241c741e6e39,971ad0aac388..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -18,8 -21,7 +21,10 @@@ phy-exynos-usb2-y			+= phy-samsung-usb2
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2)	+= phy-exynos4210-usb2.o
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2)	+= phy-exynos4x12-usb2.o
  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2)	+= phy-exynos5250-usb2.o
 +phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2)	+= phy-s5pv210-usb2.o
  obj-$(CONFIG_PHY_EXYNOS5_USBDRD)	+= phy-exynos5-usbdrd.o
  obj-$(CONFIG_PHY_XGENE)			+= phy-xgene.o
 +obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY)	+= phy-spear1310-miphy.o
 +obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY)	+= phy-spear1340-miphy.o
+ obj-$(CONFIG_PHY_QCOM_APQ8064_SATA)	+= phy-qcom-apq8064-sata.o
+ obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA)	+= phy-qcom-ipq806x-sata.o
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140724/866c4b30/attachment-0001.sig>

linux-next: manual merge of the usb tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") 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 at canb.auug.org.au

diff --cc drivers/phy/Kconfig
index 86c22e26a243,cc97c897945a..000000000000
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -124,53 -149,30 +149,40 @@@ config PHY_SUN4I_US
  config PHY_SAMSUNG_USB2
  	tristate "Samsung USB 2.0 PHY driver"
  	depends on HAS_IOMEM
+ 	depends on USB_EHCI_EXYNOS || USB_OHCI_EXYNOS || USB_DWC2
  	select GENERIC_PHY
  	select MFD_SYSCON
+ 	default ARCH_EXYNOS
  	help
  	  Enable this to support the Samsung USB 2.0 PHY driver for Samsung
- 	  SoCs. This driver provides the interface for USB 2.0 PHY. Support for
- 	  particular SoCs has to be enabled in addition to this driver. Number
- 	  and type of supported phys depends on the SoC.
+ 	  SoCs. This driver provides the interface for USB 2.0 PHY. Support
+ 	  for particular PHYs will be enabled based on the SoC type in addition
+ 	  to this driver.
  
 +config PHY_S5PV210_USB2
 +	bool "Support for S5PV210"
 +	depends on PHY_SAMSUNG_USB2
 +	depends on ARCH_S5PV210
 +	help
 +	  Enable USB PHY support for S5PV210. This option requires that Samsung
 +	  USB 2.0 PHY driver is enabled and means that support for this
 +	  particular SoC is compiled in the driver. In case of S5PV210 two phys
 +	  are available - device and host.
 +
  config PHY_EXYNOS4210_USB2
- 	bool "Support for Exynos 4210"
+ 	bool
  	depends on PHY_SAMSUNG_USB2
- 	depends on CPU_EXYNOS4210
- 	help
- 	  Enable USB PHY support for Exynos 4210. This option requires that
- 	  Samsung USB 2.0 PHY driver is enabled and means that support for this
- 	  particular SoC is compiled in the driver. In case of Exynos 4210 four
- 	  phys are available - device, host, HSIC0 and HSIC1.
+ 	default CPU_EXYNOS4210
  
  config PHY_EXYNOS4X12_USB2
- 	bool "Support for Exynos 4x12"
+ 	bool
  	depends on PHY_SAMSUNG_USB2
- 	depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412)
- 	help
- 	  Enable USB PHY support for Exynos 4x12. This option requires that
- 	  Samsung USB 2.0 PHY driver is enabled and means that support for this
- 	  particular SoC is compiled in the driver. In case of Exynos 4x12 four
- 	  phys are available - device, host, HSIC0 and HSIC1.
+ 	default SOC_EXYNOS3250 || SOC_EXYNOS4212 || SOC_EXYNOS4412
  
  config PHY_EXYNOS5250_USB2
- 	bool "Support for Exynos 5250"
+ 	bool
  	depends on PHY_SAMSUNG_USB2
- 	depends on SOC_EXYNOS5250
- 	help
- 	  Enable USB PHY support for Exynos 5250. This option requires that
- 	  Samsung USB 2.0 PHY driver is enabled and means that support for this
- 	  particular SoC is compiled in the driver. In case of Exynos 5250 four
- 	  phys are available - device, host, HSIC0 and HSIC.
+ 	default SOC_EXYNOS5250 || SOC_EXYNOS5420
  
  config PHY_EXYNOS5_USBDRD
  	tristate "Exynos5 SoC series USB DRD PHY driver"
@@@ -190,16 -194,18 +204,30 @@@ config PHY_XGEN
  	help
  	  This option enables support for APM X-Gene SoC multi-purpose PHY.
  
 +config PHY_ST_SPEAR1310_MIPHY
 +	tristate "ST SPEAR1310-MIPHY driver"
 +	select GENERIC_PHY
 +	help
 +	  Support for ST SPEAr1310 MIPHY which can be used for PCIe and SATA.
 +
 +config PHY_ST_SPEAR1340_MIPHY
 +	tristate "ST SPEAR1340-MIPHY driver"
 +	select GENERIC_PHY
 +	help
 +	  Support for ST SPEAr1340 MIPHY which can be used for PCIe and SATA.
 +
+ config PHY_QCOM_APQ8064_SATA
+ 	tristate "Qualcomm APQ8064 SATA SerDes/PHY driver"
+ 	depends on ARCH_QCOM
+ 	depends on HAS_IOMEM
+ 	depends on OF
+ 	select GENERIC_PHY
+ 
+ config PHY_QCOM_IPQ806X_SATA
+ 	tristate "Qualcomm IPQ806x SATA SerDes/PHY driver"
+ 	depends on ARCH_QCOM
+ 	depends on HAS_IOMEM
+ 	depends on OF
+ 	select GENERIC_PHY
+ 
  endmenu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140724/a6029320/attachment.sig>

linux-next: manual merge of the usb tree with the arm-soc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-tegra/Kconfig between commit ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") from the arm-soc tree and commit
f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI") 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 at canb.auug.org.au

diff --cc arch/arm/mach-tegra/Kconfig
index f61cd5b9f103,4926bd11f190..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -12,9 -18,10 +12,8 @@@ config ARCH_TEGR
  	select ARCH_HAS_RESET_CONTROLLER
  	select RESET_CONTROLLER
  	select SOC_BUS
- 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 -	select SPARSE_IRQ
  	select USB_ULPI if USB_PHY
  	select USB_ULPI_VIEWPORT if USB_PHY
 -	select USE_OF
  	help
  	  This enables support for NVIDIA Tegra based systems.
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140303/c62d0b98/attachment.sig>