Message ID | 1665005418-15807-6-git-send-email-justinpopo6@gmail.com |
---|---|
State | Accepted |
Commit | 219ec4e8f7b2023ed88262619a631d5f4ef4359f |
Headers | show |
Series | Various bug fixes/improvements for phy-brcm-usb driver | expand |
On 10/5/2022 2:30 PM, justinpopo6@gmail.com wrote: > From: Justin Chen <justinpopo6@gmail.com> > > The logic was incorrect when switching to slow clock. We want the slow > clock if wake_enabled is set. > > Fixes: ae532b2b7aa5 ("usb: Add "wake on" functionality for newer Synopsis XHCI controllers") > Signed-off-by: Justin Chen <justinpopo6@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c index 6a4d478..f78cff2 100644 --- a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c +++ b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c @@ -337,13 +337,12 @@ static void usb_uninit_common_7216(struct brcm_usb_init_params *params) pr_debug("%s\n", __func__); - if (!params->wake_enabled) { - USB_CTRL_SET(ctrl, USB_PM, USB_PWRDN); - + if (params->wake_enabled) { /* Switch to using slower clock during suspend to save power */ USB_CTRL_SET(ctrl, USB_PM, XHC_S2_CLK_SWITCH_EN); - } else { usb_wake_enable_7216(params, true); + } else { + USB_CTRL_SET(ctrl, USB_PM, USB_PWRDN); } }