From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Feb 2022 20:42:36 +0000 (+0100)
Subject: Merge 5.17-rc6 into usb-next
X-Git-Tag: v6.6.17~7891^2~77
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca9400ef7f6793288db95ca658dede6e71e777d6;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.17-rc6 into usb-next

We need the USB fixes in here, and it resolves a merge conflict in:
	drivers/usb/dwc3/dwc3-pci.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

ca9400ef7f6793288db95ca658dede6e71e777d6
diff --cc drivers/usb/dwc3/dwc3-pci.c
index 4330c97,06d0e88..2e02199
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@@ -119,10 -120,9 +120,16 @@@ static const struct property_entry dwc3
  	{}
  };
  
 +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"),
++	{}
++};
++
+ 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"),
  	{}
  };
@@@ -169,10 -169,10 +176,14 @@@ static const struct software_node dwc3_
  	.properties = dwc3_pci_intel_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_byt_swnode = {
+ 	.properties = dwc3_pci_intel_byt_properties,
+ };
+ 
  static const struct software_node dwc3_pci_intel_mrfld_swnode = {
  	.properties = dwc3_pci_mrfld_properties,
  };