| Message ID | 20220528170913.9240-1-stephan@gerhold.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 7ddda2614d62ef7fdef7fd85f5151cdf665b22d8 |
| Headers | show |
| Series | usb: dwc3: pci: Restore line lost in merge conflict resolution | expand |
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c index ba51de7dd760..6b018048fe2e 100644 --- a/drivers/usb/dwc3/dwc3-pci.c +++ b/drivers/usb/dwc3/dwc3-pci.c @@ -127,6 +127,7 @@ 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"), {} };
Commit 582ab24e096f ("usb: dwc3: pci: Set "linux,phy_charger_detect" property on some Bay Trail boards") added a new swnode similar to the existing ones for boards where the PHY handles charger detection. Unfortunately, the "linux,sysdev_is_parent" property got lost in the merge conflict resolution of commit ca9400ef7f67 ("Merge 5.17-rc6 into usb-next"). Now dwc3_pci_intel_phy_charger_detect_properties is the only swnode in dwc3-pci that is missing "linux,sysdev_is_parent". It does not seem to cause any obvious functional issues, but it's certainly unintended so restore the line to make the properties consistent again. Cc: stable@vger.kernel.org Fixes: ca9400ef7f67 ("Merge 5.17-rc6 into usb-next") Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- drivers/usb/dwc3/dwc3-pci.c | 1 + 1 file changed, 1 insertion(+)