History

usb: dwc3: pci: Restore line lost in merge conflict resolution

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.

Stephan Gerhold committed 4 years ago

Commit 7ddda261 parent 9c1e9161 file · +1 −0Browse files

Unified · Split

drivers/usb/dwc3/dwc3-pci.c+1−0
@@ -127,6 +127,7 @@ static const struct property_entry dwc3_pci_intel_phy_charger_detect_properties[ · 126 unmodified lines
127127 PROPERTY_ENTRY_STRING("dr_mode", "peripheral"),
128128 PROPERTY_ENTRY_BOOL("snps,dis_u2_susphy_quirk"),
129129 PROPERTY_ENTRY_BOOL("linux,phy_charger_detect"),
130+ PROPERTY_ENTRY_BOOL("linux,sysdev_is_parent"),
130131 {}
131132 };
132133

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t