summaryrefslogtreecommitdiff
path: root/drivers/phy
diff options
context:
space:
mode:
authorJaedon Shin <jaedon.shin@gmail.com>2018-06-08 15:10:15 +0900
committerKishon Vijay Abraham I <kishon@ti.com>2018-06-29 12:00:22 +0530
commitd70262ea0e36af4f7812e67108baa818592cde8f (patch)
treef0a6293d53f5cd3cd84e2fe64693a4b5e3d17b6d /drivers/phy
parentce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff)
downloadlinux-rpi-d70262ea0e36af4f7812e67108baa818592cde8f.tar.gz
linux-rpi-d70262ea0e36af4f7812e67108baa818592cde8f.tar.bz2
linux-rpi-d70262ea0e36af4f7812e67108baa818592cde8f.zip
phy: phy-brcm-usb-init: Fix power down USB 3.0 PHY when XHCI reenabled
Unset is required to enable USB 3.0 PHY when XHCI reenabled in response to setting PHY3_IDDQ_OVERRIDE in uninit(). Fixes: cd6f769fdea7 ("phy: phy-brcm-usb-init: Power down USB 3.0 PHY when XHCI disabled") Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/broadcom/phy-brcm-usb-init.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/phy/broadcom/phy-brcm-usb-init.c b/drivers/phy/broadcom/phy-brcm-usb-init.c
index 1b7febc43da9..29d2c3b1913a 100644
--- a/drivers/phy/broadcom/phy-brcm-usb-init.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init.c
@@ -962,6 +962,10 @@ void brcm_usb_init_xhci(struct brcm_usb_init_params *params)
{
void __iomem *ctrl = params->ctrl_regs;
+ USB_CTRL_UNSET(ctrl, USB30_PCTL, PHY3_IDDQ_OVERRIDE);
+ /* 1 millisecond - for USB clocks to settle down */
+ usleep_range(1000, 2000);
+
if (BRCM_ID(params->family_id) == 0x7366) {
/*
* The PHY3_SOFT_RESETB bits default to the wrong state.