On Mon, Feb 21, 2022 at 08:39:17PM +0000, broonie@xxxxxxxxxx wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/dwc3/dwc3-pci.c
>
> between commit:
>
> d7c93a903f33f ("usb: dwc3: pci: Add "snps,dis_u2_susphy_quirk" for Intel Bay Trail")
>
> from the usb.current tree and commit:
>
> 582ab24e096fd ("usb: dwc3: pci: Set "linux,phy_charger_detect" property on some Bay Trail boards")
>
> 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
> diff --cc drivers/usb/dwc3/dwc3-pci.c
> index 06d0e88ec8af9,4330c974b31ba..0000000000000
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@@ -120,13 -119,14 +120,21 @@@ static const struct property_entry dwc3
> {}
> };
>
> +static const struct property_entry dwc3_pci_intel_byt_properties[] = {
> + PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
> + PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
> + PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
> + {}
> +};
> +
> + static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[] = {
> + PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
> + PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
> + PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),
> + PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
> + {}
> + };
> +
> static const struct property_entry dwc3_pci_mrfld_properties[] = {
> PROPERTY_ENTRY_STRING("dr_mode", "otg"),
> PROPERTY_ENTRY_STRING("linux,extcon-name", "mrfld_bcove_pwrsrc"),
> @@@ -169,10 -169,10 +177,14 @@@ static const struct software_node dwc3_
> .properties = dwc3_pci_intel_properties,
> };
>
> +static const struct software_node dwc3_pci_intel_byt_swnode = {
> + .properties = dwc3_pci_intel_byt_properties,
> +};
> +
> + static const struct software_node dwc3_pci_intel_phy_charger_detect_swnode = {
> + .properties = dwc3_pci_intel_phy_charger_detect_properties,
> + };
> +
> static const struct software_node dwc3_pci_intel_mrfld_swnode = {
> .properties = dwc3_pci_mrfld_properties,
> };
Looks good, thanks!
greg k-h
