mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 00:00:00 -04:00
Merge "pci: msm: Bringing EP out of reset prior link up"
This commit is contained in:
commit
de10b5718b
1 changed files with 8 additions and 6 deletions
|
|
@ -4682,9 +4682,15 @@ static int msm_pcie_enable(struct msm_pcie_dev_t *dev)
|
|||
|
||||
ep_up_timeout = jiffies + usecs_to_jiffies(EP_UP_TIMEOUT_US);
|
||||
|
||||
if (dev->i2c_ctrl.client && dev->i2c_ctrl.client_i2c_de_emphasis_wa)
|
||||
if (dev->i2c_ctrl.client && dev->i2c_ctrl.client_i2c_de_emphasis_wa) {
|
||||
dev->i2c_ctrl.client_i2c_de_emphasis_wa(&dev->i2c_ctrl);
|
||||
|
||||
msleep(20);
|
||||
}
|
||||
/* bring eps out of reset */
|
||||
if (dev->i2c_ctrl.client && dev->i2c_ctrl.client_i2c_reset) {
|
||||
dev->i2c_ctrl.client_i2c_reset(&dev->i2c_ctrl, false);
|
||||
msleep(100);
|
||||
}
|
||||
msm_pcie_config_sid(dev);
|
||||
msm_pcie_config_controller(dev);
|
||||
|
||||
|
|
@ -4732,10 +4738,6 @@ static int msm_pcie_enable(struct msm_pcie_dev_t *dev)
|
|||
if (dev->enumerated)
|
||||
msm_msi_config(dev_get_msi_domain(&dev->dev->dev));
|
||||
|
||||
/* bring eps out of reset */
|
||||
if (dev->i2c_ctrl.client && dev->i2c_ctrl.client_i2c_reset)
|
||||
dev->i2c_ctrl.client_i2c_reset(&dev->i2c_ctrl, false);
|
||||
|
||||
goto out;
|
||||
|
||||
link_fail:
|
||||
|
|
|
|||
Loading…
Reference in a new issue