diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 13:16:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-21 13:16:41 -0400 |
| commit | cf24242189b935826a88feedb64761cbf483e42c (patch) | |
| tree | 5de0f1d93fbffc029399e688aa3748b0bb5409fb /drivers/usb/dwc2/platform.c | |
| parent | c884d8ac7ffccc094e9674a3eb3be90d3b296c0a (diff) | |
| parent | d28bdaff5e260852621d45edd3af017cc5d16925 (diff) | |
Merge tag 'usb-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are four small USB fixes for 5.2-rc6.
They include two xhci bugfixes, a chipidea fix, and a small dwc2 fix.
Nothing major, just nice things to get resolved for reported issues.
All have been in linux-next with no reported issues"
* tag 'usb-5.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
xhci: detect USB 3.2 capable host controllers correctly
usb: xhci: Don't try to recover an endpoint if port is in error state.
usb: dwc2: Use generic PHY width in params setup
usb: chipidea: udc: workaround for endpoint conflict issue
Diffstat (limited to 'drivers/usb/dwc2/platform.c')
| -rw-r--r-- | drivers/usb/dwc2/platform.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index d10a7f8daec3..e98d7812da2d 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c | |||
| @@ -271,15 +271,6 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) | |||
| 271 | 271 | ||
| 272 | hsotg->plat = dev_get_platdata(hsotg->dev); | 272 | hsotg->plat = dev_get_platdata(hsotg->dev); |
| 273 | 273 | ||
| 274 | if (hsotg->phy) { | ||
| 275 | /* | ||
| 276 | * If using the generic PHY framework, check if the PHY bus | ||
| 277 | * width is 8-bit and set the phyif appropriately. | ||
| 278 | */ | ||
| 279 | if (phy_get_bus_width(hsotg->phy) == 8) | ||
| 280 | hsotg->params.phy_utmi_width = 8; | ||
| 281 | } | ||
| 282 | |||
| 283 | /* Clock */ | 274 | /* Clock */ |
| 284 | hsotg->clk = devm_clk_get_optional(hsotg->dev, "otg"); | 275 | hsotg->clk = devm_clk_get_optional(hsotg->dev, "otg"); |
| 285 | if (IS_ERR(hsotg->clk)) { | 276 | if (IS_ERR(hsotg->clk)) { |
