evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: phy: qusb2: Enable phy auto-resume"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-16 13:29:53 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4b3736890b
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/usb/phy/phy-msm-qusb.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -47,6 +47,8 @@
#define FREEZIO_N BIT(1) #define FREEZIO_N BIT(1)
#define POWER_DOWN BIT(0) #define POWER_DOWN BIT(0)
#define QUSB2PHY_PORT_TEST_CTRL 0xB8
#define QUSB2PHY_PWR_CTRL1 0x210 #define QUSB2PHY_PWR_CTRL1 0x210
#define PWR_CTRL1_CLAMP_N_EN BIT(1) #define PWR_CTRL1_CLAMP_N_EN BIT(1)
#define PWR_CTRL1_POWR_DOWN BIT(0) #define PWR_CTRL1_POWR_DOWN BIT(0)
@ -688,6 +690,21 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend)
writel_relaxed(intr_mask, writel_relaxed(intr_mask,
qphy->base + QUSB2PHY_PORT_INTR_CTRL); qphy->base + QUSB2PHY_PORT_INTR_CTRL);
/* enable phy auto-resume */
writel_relaxed(0x0C,
qphy->base + QUSB2PHY_PORT_TEST_CTRL);
/* flush the previous write before next write */
wmb();
writel_relaxed(0x04,
qphy->base + QUSB2PHY_PORT_TEST_CTRL);
dev_dbg(phy->dev, "%s: intr_mask = %x\n",
__func__, intr_mask);
/* Makes sure that above write goes through */
wmb();
qusb_phy_enable_clocks(qphy, false); qusb_phy_enable_clocks(qphy, false);
} else { /* Disconnect case */ } else { /* Disconnect case */
/* Disable all interrupts */ /* Disable all interrupts */